diff options
| author | John Keeping <john@keeping.me.uk> | 2013-04-27 13:40:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 18:53:41 (GMT) |
| commit | ab5f42422d7e025c3151d91cc5ec0d20b9a80922 (patch) | |
| tree | 4d5b34b530add1399b22f5bce0bdc87fd78bb7fa /t | |
| parent | aacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 (diff) | |
| download | git-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.zip git-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.tar.gz git-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.tar.bz2 | |
merge-tree: fix typo in "both changed identically"
Commit aacecc3 (merge-tree: don't print entries that match "local" -
2013-04-07) had a typo causing the "same in both" check to be incorrect
and check if both the base and "their" versions are removed instead of
checking that both the "our" and "their" versions are removed. Fix
this.
Reported-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Test-written-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4300-merge-tree.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index bd43b3d..2defb42 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -205,6 +205,19 @@ EXPECTED test_cmp expected actual ' +test_expect_success 'file remove A, B (same)' ' + cat >expected <<\EXPECTED && +EXPECTED + + git reset --hard initial && + test_commit "rm-a-b-base" "ONE" "AAA" && + git rm ONE && + git commit -m "rm-a-b" && + git tag "rm-a-b" && + git merge-tree rm-a-b-base rm-a-b rm-a-b >actual && + test_cmp expected actual +' + test_expect_success 'file change A, remove B' ' cat >expected <<\EXPECTED && removed in remote |