diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:22 -0700 |
commit | 41534b626ebdf3fb4fb692749245b90ff2bb7e13 (patch) | |
tree | 6948d02d5cc525926a01cfa1b3434a67791a6122 /t/t9161-git-svn-mergeinfo-push.sh | |
parent | e25c1229b2f7f12fd3284297a73bb889c8f35f63 (diff) | |
parent | fd4692ff7040e690546ed139a419995e76a96196 (diff) | |
download | git-41534b626ebdf3fb4fb692749245b90ff2bb7e13.tar.gz |
Merge branch 'jk/interpret-branch-name' into maint
"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.
* jk/interpret-branch-name:
checkout: restrict @-expansions when finding branch
strbuf_check_ref_format(): expand only local branches
branch: restrict @-expansions when deleting
t3204: test git-branch @-expansion corner cases
interpret_branch_name: allow callers to restrict expansions
strbuf_branchname: add docstring
strbuf_branchname: drop return value
interpret_branch_name: move docstring to header file
interpret_branch_name(): handle auto-namelen for @{-1}
Diffstat (limited to 't/t9161-git-svn-mergeinfo-push.sh')
0 files changed, 0 insertions, 0 deletions