diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 01:52:48 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:02 -0700 |
| commit | b81f925f709a10b37fb4fcd03629b55bc890a478 (patch) | |
| tree | 915874e3e43dc2615104b2fceca2ea5ecfffa1e5 /fixup-builtins | |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff) | |
| download | git-b81f925f709a10b37fb4fcd03629b55bc890a478.tar.gz | |
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>
Diffstat (limited to 'fixup-builtins')
0 files changed, 0 insertions, 0 deletions