• J
    Merge branch 'jk/interpret-branch-name' into maint · 41534b62
    Junio C Hamano 提交于
    "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}
    41534b62
merge.c 43.6 KB