diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-23 21:52:18 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-23 22:52:52 -0800 |
commit | 29561ad0adadf4884858c209bb22b41d8d9a66ba (patch) | |
tree | b601dee164be7d38093e8c83d133e1adabfe0dec /gitk | |
parent | Increase length of function name buffer (diff) | |
download | tgif-29561ad0adadf4884858c209bb22b41d8d9a66ba.tar.xz |
refs outside refs/{heads,tags} match less strongly.
This changes the refname matching logic used to decide which ref
is updated with git-send-pack. We used to error out when
pushing 'master' when the other end has both 'master' branch and
a tracking branch 'remotes/$name/master' but with this, 'master'
matches only 'refs/heads/master' when both and no other 'master'
exist.
Pushing 'foo' when both heads/foo and tags/foo exist at the
remote end is still considered an error and you would need to
disambiguate between them by being more explicit.
When neither heads/foo nor tags/foo exists at the remote,
pushing 'foo' when there is only remotes/origin/foo is not
ambiguous, while it still is ambiguous when there are more than
one such weaker match (remotes/origin/foo and remotes/alt/foo,
for example).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitk')
0 files changed, 0 insertions, 0 deletions