From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: johan@herland.net, gitster@pobox.com
Subject: [PATCHv2 0/8] Improving the search for remote-tracking branches
Date: Sat, 20 Apr 2013 17:05:55 +0200 [thread overview]
Message-ID: <1366470363-22309-1-git-send-email-johan@herland.net> (raw)
Hi,
This is second iteration of this series. The initial three patches are
unchanged, although the commit message of #3 has been rephrased based
on Junio's comments.
Patches #4-#6 fixes existing tests in preparation for patch #7, which
changes the validation of the remote-tracking branch passed to --track:
We now require the --track argument to refer to a ref that matches a
configured refspec - otherwise, we can not reliably deduce the upstream
information to store into branch.<name>.remote and branch.<name>.merge.
Finally, patch #8 updates the paragraph on remote-tracking branches in
the glossary to be somewhat closer to the current state of things.
Have fun! :)
...Johan
Johan Herland (8):
t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
t2024: Show failure to use refspec when DWIMming remote branch names
checkout: Use remote refspecs when DWIMming tracking branches
t3200.39: tracking setup should fail if there is no matching refspec.
t7201.24: Add refspec to keep --track working
t9114.2: Don't use --track option against "svn-remote"-tracking branches
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
glossary: Update and rephrase the definition of a remote-tracking branch
Documentation/git-checkout.txt | 6 +-
Documentation/glossary-content.txt | 13 +++--
branch.c | 17 +++++-
builtin/checkout.c | 42 +++++++-------
t/t2024-checkout-dwim.sh | 116 +++++++++++++++++++++++++++++++++++++
t/t3200-branch.sh | 8 +--
t/t7201-co.sh | 1 +
t/t9114-git-svn-dcommit-merge.sh | 2 +-
8 files changed, 170 insertions(+), 35 deletions(-)
create mode 100755 t/t2024-checkout-dwim.sh
--
1.8.1.3.704.g33f7d4f
next reply other threads:[~2013-04-20 15:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-20 15:05 Johan Herland [this message]
2013-04-20 15:05 ` [PATCHv2 1/8] t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>' Johan Herland
2013-04-20 20:44 ` Jonathan Nieder
2013-04-20 22:53 ` Johan Herland
2013-04-20 15:05 ` [PATCHv2 2/8] t2024: Show failure to use refspec when DWIMming remote branch names Johan Herland
2013-04-20 15:05 ` [PATCHv2 3/8] checkout: Use remote refspecs when DWIMming tracking branches Johan Herland
2013-04-20 15:05 ` [PATCHv2 4/8] t3200.39: tracking setup should fail if there is no matching refspec Johan Herland
2013-04-20 15:06 ` [PATCHv2 5/8] t7201.24: Add refspec to keep --track working Johan Herland
2013-04-20 15:06 ` [PATCHv2 6/8] t9114.2: Don't use --track option against "svn-remote"-tracking branches Johan Herland
2013-04-21 5:24 ` Eric Wong
2013-04-20 15:06 ` [PATCHv2 7/8] branch.c: Validate tracking branches with refspecs instead of refs/remotes/* Johan Herland
2013-04-20 15:06 ` [PATCHv2 8/8] glossary: Update and rephrase the definition of a remote-tracking branch Johan Herland
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366470363-22309-1-git-send-email-johan@herland.net \
--to=johan@herland.net \
--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.
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 NNTP newsgroup(s).