diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-03 05:17:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-03 06:55:57 (GMT) |
| commit | 67bfc030d7b27c007853776e8028598bdfa2cae0 (patch) | |
| tree | 8fae799207c6263f9826e333de27fdfd9eb50c51 /t/t7502-commit.sh | |
| parent | 69e66f5500ef6079e3374a6654ef1f6df0c6f360 (diff) | |
| download | git-67bfc030d7b27c007853776e8028598bdfa2cae0.zip git-67bfc030d7b27c007853776e8028598bdfa2cae0.tar.gz git-67bfc030d7b27c007853776e8028598bdfa2cae0.tar.bz2 | |
commit: drop duplicated parents
The scripted version of git-commit internally used git-commit-tree which
omitted duplicated parents given from the command line. This prevented a
nonsensical octopus merge from getting created even when you said "git
merge A B" while you are already on branch A.
However, when git-commit was rewritten in C, this sanity check was lost.
This resurrects it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7502-commit.sh')
| -rwxr-xr-x | t/t7502-commit.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 46ec1ce..22a13f7 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -226,4 +226,18 @@ test_expect_success 'a SIGTERM should break locks' ' ! test -f .git/index.lock ' +rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG +git reset -q --hard + +test_expect_success 'Hand committing of a redundant merge removes dups' ' + + git rev-parse second master >expect && + test_must_fail git merge second master && + git checkout master g && + EDITOR=: git commit -a && + git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual && + test_cmp expect actual + +' + test_done |