From: Pete Wyckoff <pw@padd.com>
To: Brandon Casey <bcasey@nvidia.com>
Cc: gitster@pobox.com, git@vger.kernel.org,
Brandon Casey <drafnel@gmail.com>
Subject: Re: [PATCH 2/2] t/t9802: explicitly name the upstream branch to use as a base
Date: Tue, 18 Jun 2013 09:42:07 -0400 [thread overview]
Message-ID: <20130618134207.GA28716@padd.com> (raw)
In-Reply-To: <1371519650-17869-2-git-send-email-bcasey@nvidia.com>
bcasey@nvidia.com wrote on Mon, 17 Jun 2013 18:40 -0700:
> From: Brandon Casey <drafnel@gmail.com>
>
> 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'.
Thanks for finding and fixing this. Great explanation. I
tested it locally too.
Acked-by: Pete Wyckoff <pw@padd.com>
-- Pete
next prev parent reply other threads:[~2013-06-18 13:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 1:40 [PATCH 1/2] builtin/checkout.c: don't leak memory in check_tracking_name Brandon Casey
2013-06-18 1:40 ` [PATCH 2/2] t/t9802: explicitly name the upstream branch to use as a base Brandon Casey
2013-06-18 13:42 ` Pete Wyckoff [this message]
2013-06-18 16:17 ` Junio C Hamano
2013-06-18 6:15 ` [PATCH 1/2] builtin/checkout.c: don't leak memory in check_tracking_name Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130618134207.GA28716@padd.com \
--to=pw@padd.com \
--cc=bcasey@nvidia.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).