diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-22 15:07:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-22 15:08:35 -0700 |
| commit | d5b592cf6799e3e9d80150c62af6033ba2c32a5a (patch) | |
| tree | fa4d66df71d618a223f526fe2c85835e4c2cb8ab /t | |
| parent | 498a04af143f55a7bbbba484d48a7f123d43be04 (diff) | |
| parent | 536caca5ce0d88e4c54e9e7376ed182807702c58 (diff) | |
| download | git-jk/merge-recursive-no-rename-empty.tar.gz | |
Adjust 'jk/maint-1.7.7-merge-recursive-no-rename-empty' for the 1.7.10 codebasejk/merge-recursive-no-rename-empty
A new offender that casts EMPTY_TREE_SHA1_BIN was added to sequencer.c
after 1.7.9.x maintenance track; adjust the "merge-recursive" series
applied for older maintenance track to the current codebase.
* jk/maint-1.7.7-merge-recursive-no-rename-empty:
merge-recursive: don't detect renames from empty files
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6022-merge-rename.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 9d8584e957..1104249182 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -884,4 +884,20 @@ test_expect_success 'no spurious "refusing to lose untracked" message' ' ! grep "refusing to lose untracked file" errors.txt ' +test_expect_success 'do not follow renames for empty files' ' + git checkout -f -b empty-base && + >empty1 && + git add empty1 && + git commit -m base && + echo content >empty1 && + git add empty1 && + git commit -m fill && + git checkout -b empty-topic HEAD^ && + git mv empty1 empty2 && + git commit -m rename && + test_must_fail git merge empty-base && + >expect && + test_cmp expect empty2 +' + test_done |