commit | 67bfc030d7b27c007853776e8028598bdfa2cae0 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Jun 02 22:17:42 2008 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Jun 02 23:55:57 2008 -0700 |
tree | 8fae799207c6263f9826e333de27fdfd9eb50c51 | |
parent | 69e66f5500ef6079e3374a6654ef1f6df0c6f360 [diff] |
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>