diff options
| author | Elijah Newren <newren@gmail.com> | 2011-02-28 18:08:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-02 11:52:59 -0800 |
| commit | eeba0d1760d6922e7d6ee838b8684e87a6c0c273 (patch) | |
| tree | d545e76e239b17726b56a10dbc0a7bc52a3880f4 | |
| parent | f59ba1cea02b3bed1025fd22f8601923fc81b6af (diff) | |
| download | git-eeba0d1760d6922e7d6ee838b8684e87a6c0c273.tar.gz | |
t6022: New test checking for unnecessary updates of files in D/F conflicts
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6022-merge-rename.sh | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 56ccd8a6fa..6b3e8b8d4b 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -737,4 +737,37 @@ test_expect_failure 'avoid unnecessary update, normal rename' ' test_cmp expect actual # "rename" should have stayed intact ' +test_expect_success 'setup to test avoiding unnecessary update, with D/F conflict' ' + git reset --hard && + git checkout --orphan avoid-unnecessary-update-2 && + git rm -rf . && + git clean -fdqx && + + mkdir df && + printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file && + git add -A && + git commit -m "Common commmit" && + + git mv df/file temp && + rm -rf df && + git mv temp df && + echo 11 >>df && + git add -u && + git commit -m "Renamed and modified" && + + git checkout -b merge-branch-2 HEAD~1 && + >unrelated-change && + git add unrelated-change && + git commit -m "Only unrelated changes" +' + +test_expect_failure 'avoid unnecessary update, with D/F conflict' ' + git checkout -q avoid-unnecessary-update-2^0 && + test-chmtime =1000000000 df && + test-chmtime -v +0 df >expect && + git merge merge-branch-2 && + test-chmtime -v +0 df >actual && + test_cmp expect actual # "df" should have stayed intact +' + test_done |