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 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
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html