diff options
| author | Elijah Newren <newren@gmail.com> | 2010-08-17 23:53:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 19:08:08 (GMT) |
| commit | ae745487ad7a4ceca0e903da6df21be2c1ebfc29 (patch) | |
| tree | f3b8da751ad9bade1c551b0968b252b7af9a87b5 /t/t6031-merge-recursive.sh | |
| parent | 5601ba6574cfbd1249a6d38b72159a7d3ccf8315 (diff) | |
| download | git-ae745487ad7a4ceca0e903da6df21be2c1ebfc29.zip git-ae745487ad7a4ceca0e903da6df21be2c1ebfc29.tar.gz git-ae745487ad7a4ceca0e903da6df21be2c1ebfc29.tar.bz2 | |
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>
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index c50ee29..bd75e0e 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -57,7 +57,7 @@ test_expect_success FILEMODE 'verify executable bit on file' ' test -x file2 ' -test_expect_failure 'merging with triple rename across D/F conflict' ' +test_expect_success 'merging with triple rename across D/F conflict' ' git reset --hard HEAD && git checkout -b main && git rm -rf . && |