git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-filter-branch could be confused by similar names

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 30, 2007, 10:46 UTC
Message-ID
<Pine.LNX.4.64.0712301145360.14355@wbgn129.biozentrum.uni-wuerzburg.de>
In-Reply-To
<20071230103146.GU13968@dpotapov.dyndns.org>
Hi,
On Sun, 30 Dec 2007, Dmitry Potapov wrote:
Show 34 quoted lines
> On Sat, Dec 29, 2007 at 11:36:51PM +0100, Johannes Schindelin wrote:
> > 
> > On Tue, 25 Dec 2007, Dmitry Potapov wrote:
> > 
> > > '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>
> > > ---
> > >  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..b89a720 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"'$')"
> > 
> > Hmm.  I wonder if this is a proper solution.  It still does not error 
> > out when you have a tag and a branch of the same name.
> 
> Are you sure? I had created a tag and a branch with the same name, and
> then tried git filter-branch on it, and it did error out:
> ===
> warning: refname 'test1' is ambiguous.
> Which ref do you want to rewrite?
> ===

Okay, bad example. But try "heads/master". Or "origin" in a repository which has "refs/remotes/origin/HEAD".

Ciao, Dscho

Previous: Dmitry PotapovNext: Dmitry Potapov
Message 4 of 18 in “git-filter-branch could be confused by similar names”
  1. git-filter-branch could be confused by similar namesDmitry Potapov, Dec 25, 2007
  2. Johannes SchindelinDec 29, 2007
  3. Dmitry PotapovDec 30, 2007
  4. Johannes SchindelinDec 30, 2007
  5. Dmitry PotapovDec 30, 2007
  6. Johannes SchindelinDec 30, 2007
  7. Dmitry PotapovDec 30, 2007
  8. git-filter-branch could be confused by similar namesDmitry Potapov, Dec 30, 2007
  9. Junio C HamanoJan 3, 2008
  10. Dmitry PotapovJan 4, 2008
  11. Junio C HamanoJan 4, 2008
  12. Johannes SchindelinJan 5, 2008
  13. 1/2 git-rev-parse --symbolic-full-nameJunio C Hamano, Jan 5, 2008
  14. 2/2 filter-branch: work correctly with ambiguous refnamesJunio C Hamano, Jan 5, 2008
  15. Johannes SchindelinJan 6, 2008
  16. Junio C HamanoJan 6, 2008
  17. Johannes SchindelinJan 6, 2008
  18. Junio C HamanoJan 5, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.