diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:02 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:36 -0700 |
| commit | b8ddf16424f2d4f29a73b89dabbb764763744abe (patch) | |
| tree | 489271882c0c0c4067ab8541d57b2a7094140e73 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: Allow make_room_for_path() to remove D/F entries (diff) | |
| download | git-b8ddf16424f2d4f29a73b89dabbb764763744abe.tar.gz git-b8ddf16424f2d4f29a73b89dabbb764763744abe.zip | |
merge-recursive: Split update_stages_and_entry; only update stages at end
Instead of having the process_renames logic update the stages in the index
for the rename destination, have the index updated after process_entry or
process_df_entry. This will also allow us to have process_entry determine
whether a file was tracked and existed in the working copy before the
merge started.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions