From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v2] fixing corner-cases with interpret_branch_name()
Date: Thu, 2 Mar 2017 03:21:00 -0500 [thread overview]
Message-ID: <20170302082100.edaretznmlralswa@sigill.intra.peff.net> (raw)
This is a re-roll of the series from:
http://public-inbox.org/git/20170228120633.zkwfqms57fk7dkl5@sigill.intra.peff.net/
Thanks Junio and Jake for reviewing the original. This is mostly the
same, but:
- it fixes the case where "branch -r @{-1}" mistakes a local branch
for a remote (and adds a test)
- as a result of the above fix, the series needs to be applied on top
of jk/auto-namelen-in-interpret-branch-name.
- I clarified the history in the commit message of patch 4
- the commit message for patch 4 now explicitly mentions which
callers can be left alone (so anybody blaming the history won't
think they were simply forgotten).
With the exception of patch 6 flipping the failure/success bit on the
new test, the rest of the patches should be identical.
[1/8]: interpret_branch_name: move docstring to header file
[2/8]: strbuf_branchname: drop return value
[3/8]: strbuf_branchname: add docstring
[4/8]: interpret_branch_name: allow callers to restrict expansions
[5/8]: t3204: test git-branch @-expansion corner cases
[6/8]: branch: restrict @-expansions when deleting
[7/8]: strbuf_check_ref_format(): expand only local branches
[8/8]: checkout: restrict @-expansions when finding branch
builtin/branch.c | 5 +-
builtin/checkout.c | 2 +-
builtin/merge.c | 2 +-
cache.h | 32 +++++++-
refs.c | 2 +-
revision.c | 2 +-
sha1_name.c | 92 ++++++++++++-----------
strbuf.h | 21 +++++-
t/t3204-branch-name-interpretation.sh | 133 ++++++++++++++++++++++++++++++++++
9 files changed, 240 insertions(+), 51 deletions(-)
create mode 100755 t/t3204-branch-name-interpretation.sh
-Peff
next reply other threads:[~2017-03-02 8:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-02 8:21 Jeff King [this message]
2017-03-02 8:21 ` [PATCH v2 1/8] interpret_branch_name: move docstring to header file Jeff King
2017-03-02 8:21 ` [PATCH v2 2/8] strbuf_branchname: drop return value Jeff King
2017-03-02 8:21 ` [PATCH v2 3/8] strbuf_branchname: add docstring Jeff King
2017-03-02 8:23 ` [PATCH v2 4/8] interpret_branch_name: allow callers to restrict expansions Jeff King
2017-03-02 8:23 ` [PATCH v2 5/8] t3204: test git-branch @-expansion corner cases Jeff King
2017-03-02 8:23 ` [PATCH v2 6/8] branch: restrict @-expansions when deleting Jeff King
2017-03-02 8:23 ` [PATCH v2 7/8] strbuf_check_ref_format(): expand only local branches Jeff King
2017-03-02 8:23 ` [PATCH v2 8/8] checkout: restrict @-expansions when finding branch Jeff King
2017-03-02 8:47 ` [PATCH v2] fixing corner-cases with interpret_branch_name() Jacob Keller
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=20170302082100.edaretznmlralswa@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.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).