| commit | b8ddf16424f2d4f29a73b89dabbb764763744abe | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:02 +0000 (11 23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:36 +0000 (14 14:19 -0700) | ||
| tree | 489271882c0c0c4067ab8541d57b2a7094140e73 | treesnapshot (tar.gz zip) |
| parent | ed0148a520ec2ec88f0574c2e107aba0a46936e1 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |