diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 17:58:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 07:11:00 (GMT) |
| commit | 79c47598f5c8c0008ae9281f20c2a041d4cabd93 (patch) | |
| tree | 889171881bb406243998cde584decd73fea00721 /t/t6043-merge-rename-directories.sh | |
| parent | 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 (diff) | |
| download | git-79c47598f5c8c0008ae9281f20c2a041d4cabd93.zip git-79c47598f5c8c0008ae9281f20c2a041d4cabd93.tar.gz git-79c47598f5c8c0008ae9281f20c2a041d4cabd93.tar.bz2 | |
merge-recursive: avoid clobbering untracked files with directory renames
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6043-merge-rename-directories.sh')
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 3525c54..0b60eb8 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -2992,7 +2992,7 @@ test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' ' ) ' -test_expect_failure '10b-check: Overwrite untracked with dir rename + delete' ' +test_expect_success '10b-check: Overwrite untracked with dir rename + delete' ' ( cd 10b && @@ -3070,7 +3070,7 @@ test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2) ) ' -test_expect_failure '10c-check: Overwrite untracked with dir rename/rename(1to2)' ' +test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' ' ( cd 10c && @@ -3145,7 +3145,7 @@ test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' ' ) ' -test_expect_failure '10d-check: Delete untracked with dir rename/rename(2to1)' ' +test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' ' ( cd 10d && |