![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 06:52:48 +0000 (01:52 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:02 +0000 (14:02 -0700) | ||
| commit | b81f925f709a10b37fb4fcd03629b55bc890a478 | |
| tree | 915874e3e43dc2615104b2fceca2ea5ecfffa1e5 | tree | snapshot |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 | commit | diff |
merge: do not mistake (ancestor of) tag for branch
If no branch 'foo' exists but a tag 'foo' does, then
git merge foo^ results in
Merge branch 'foo' (early part)
as a commit message, because the relevant code path checks that
refs/heads/foo is a valid refname for writing rather than for
reading.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If no branch 'foo' exists but a tag 'foo' does, then
git merge foo^ results in
Merge branch 'foo' (early part)
as a commit message, because the relevant code path checks that
refs/heads/foo is a valid refname for writing rather than for
reading.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |