| commit | ae745487ad7a4ceca0e903da6df21be2c1ebfc29 | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 17 Aug 2010 23:53:19 +0000 (17 17:53 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:08:08 +0000 (18 12:08 -0700) | ||
| tree | f3b8da751ad9bade1c551b0968b252b7af9a87b5 | treesnapshot (tar.gz zip) |
| parent | 5601ba6574cfbd1249a6d38b72159a7d3ccf8315 | commitdiff |
merge-recursive: Fix multiple file rename across D/F conflict
In 5a2580d (merge_recursive: Fix renames across paths below D/F conflicts
2010-07-09), detection was added for renames across paths involved in a
directory<->file conflict. However, the change accidentally involved
reusing an outer loop index ('i') in an inner loop, changing its values
and causing a slightly different type of breakage for cases where there are
multiple renames across the D/F conflict. Fix by creating a new temporary
variable 'i'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In 5a2580d (merge_recursive: Fix renames across paths below D/F conflicts
2010-07-09), detection was added for renames across paths involved in a
directory<->file conflict. However, the change accidentally involved
reusing an outer loop index ('i') in an inner loop, changing its values
and causing a slightly different type of breakage for cases where there are
multiple renames across the D/F conflict. Fix by creating a new temporary
variable 'i'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory | |
| t/t6031-merge-recursive.sh | diffblobblamehistory |