From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Feb 2020 22:34:58 +0000 (-0800)
Subject: Merge branch 'am/checkout-file-and-ref-ref-ambiguity'
X-Git-Tag: v2.26.0-rc0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e70cd32e95df3be2250536f9089c858a298874;p=thirdparty%2Fgit.git

Merge branch 'am/checkout-file-and-ref-ref-ambiguity'

"git checkout X" did not correctly fail when X is not a local
branch but could name more than one remote-tracking branches
(i.e. to be dwimmed as the starting point to create a corresponding
local branch), which has been corrected.

* am/checkout-file-and-ref-ref-ambiguity:
  checkout: don't revert file on ambiguous tracking branches
  parse_branchname_arg(): extract part as new function
---

d0e70cd32e95df3be2250536f9089c858a298874