summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2013-06-17 18:40:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-18 09:16:58 -0700
commit9d58c4a3e3ce3a40262b7ff3cc39ce3b9a93d527 (patch)
treec973565dcad98844e16486c7b7f887f74e82537f /builtin/merge.c
parentbuiltin/checkout.c: don't leak memory in check_tracking_name (diff)
downloadtgif-9d58c4a3e3ce3a40262b7ff3cc39ce3b9a93d527.tar.xz
t/t9802: explicitly name the upstream branch to use as a base
Prior to commit fa83a33b, the 'git checkout' DWIMery would create a new local branch if the specified branch name did not exist and it matched exactly one ref in the "remotes" namespace. It searched the "remotes" namespace for matching refs using a simple comparison of the trailing portion of the remote ref names. This approach could sometimes produce false positives or negatives. Since fa83a33b, the DWIMery more strictly excludes the remote name from the ref comparison by iterating through the remotes that are configured in the .gitconfig file. This has the side-effect that any refs that exist in the "remotes" namespace, but do not match the destination side of any remote refspec, will not be used by the DWIMery. This change in behavior breaks the tests in t9802 which relied on the old behavior of searching all refs in the remotes namespace, since the git-p4 script does not configure any remotes in the .gitconfig. Let's work around this in these tests by explicitly naming the upstream branch to base the new local branch on when calling 'git checkout'. Signed-off-by: Brandon Casey <drafnel@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions