From: Junio C Hamano <gitster@pobox.com>
To: Dmitry Potapov <dpotapov@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] git-filter-branch could be confused by similar names
Date: Thu, 03 Jan 2008 13:27:27 -0800 [thread overview]
Message-ID: <7v7iiqppkw.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1199040667-31850-1-git-send-email-dpotapov@gmail.com> (Dmitry Potapov's message of "Sun, 30 Dec 2007 21:51:07 +0300")
Dmitry Potapov <dpotapov@gmail.com> writes:
> 'git-filter-branch branch' could fail producing the error:
> "Which ref do you want to rewrite?" if existed another branch
> or tag, which name was 'branch-something' or 'something/branch'.
>
> Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
> ---
>
> I have corrected my previous patch to allow "heads" or "tags"
> in the name of a branch or tag, i.e. to write it like this:
> git filter-branch heads/master
>
> git-filter-branch.sh | 2 +-
> t/t7003-filter-branch.sh | 10 ++++++++++
> 2 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index dbab1a9..5de8b12 100755
> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -219,7 +219,7 @@ do
> ;;
> *)
> ref="$(git for-each-ref --format='%(refname)' |
> - grep /"$ref")"
> + grep '^refs/\([^/]\+/\)\?'"$ref"'$')"
> esac
Do we assume everybody's grep groks ERE these days? I had an
impression that we try to stick to a subset of BRE (namely, no
\{m,n\}, [::], [==], nor [..]).
Also as a general rule when dealing with refname, we use
fileglob not regex.
What's the goal here? Is it to make sure given refname is
unambiguous by being a unique suffix of tags or heads, as in
test $(git show-ref "$ref" | wc -l) = 1
or is there anything more going on?
Ah, it also wants the full name of the ref. How about...
ref=$(git show-ref "$ref" | sed -e 's/^.* //')
and have the "git check-ref-format" that comes later to issue an
error message?
A better error message would be obtained with perhaps doing
LF='
'
at the beginning and then doing:
candidate=$(git show-ref "$ref" | sed -e 's/^.* //')
case "$candidate" in
'')
die "should not happen -- $ref did not match?"
;;
?*"$LF"?*)
die "$ref is ambiguous, which one of: $canidate?"
;;
esac
ref=$candidate
next prev parent reply other threads:[~2008-01-03 21:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-25 14:35 [PATCH] git-filter-branch could be confused by similar names Dmitry Potapov
2007-12-29 22:36 ` Johannes Schindelin
2007-12-30 10:31 ` Dmitry Potapov
2007-12-30 10:46 ` Johannes Schindelin
2007-12-30 13:54 ` Dmitry Potapov
2007-12-30 16:03 ` Johannes Schindelin
2007-12-30 18:40 ` Dmitry Potapov
2007-12-30 18:51 ` Dmitry Potapov
2008-01-03 21:27 ` Junio C Hamano [this message]
2008-01-04 15:51 ` Dmitry Potapov
2008-01-04 20:28 ` Junio C Hamano
2008-01-05 16:03 ` Johannes Schindelin
2008-01-05 20:23 ` [PATCH 1/2] git-rev-parse --symbolic-full-name Junio C Hamano
2008-01-05 20:28 ` [PATCH 2/2] filter-branch: work correctly with ambiguous refnames Junio C Hamano
2008-01-06 1:57 ` Johannes Schindelin
2008-01-06 2:53 ` Junio C Hamano
2008-01-06 9:14 ` Johannes Schindelin
2008-01-05 1:17 ` [PATCH] git-filter-branch could be confused by similar names Junio C Hamano
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=7v7iiqppkw.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
/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).