![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2008 05:17:42 +0000 (22:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2008 06:55:57 +0000 (23:55 -0700) | ||
| commit | 67bfc030d7b27c007853776e8028598bdfa2cae0 | |
| tree | 8fae799207c6263f9826e333de27fdfd9eb50c51 | tree | snapshot |
| parent | 69e66f5500ef6079e3374a6654ef1f6df0c6f360 | commit | 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>
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>
| builtin-commit.c | diff | blob | history | |
| t/t7502-commit.sh | diff | blob | history |