Home » Mailing list archives » git » 2009 » April » 2

Re: [PATCH] tree_entry_interesting: Only recurse when the pathspec is a leading path component

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Björn <B.Steinbrink@...>
To: Junio C Hamano <gitster@...>
Cc: Eric Wong <normalperson@...>, Anton Gyllenberg <anton@...>, <git@...>
Subject: Re: [PATCH] tree_entry_interesting: Only recurse when the pathspec is a leading path component
Date: Thursday, April 2, 2009 - 7:38 am

On 2009.04.01 21:32:05 -0700, Junio C Hamano wrote:

Ah, thanks. Got busy with other stuff, and tried to fix another related
bug in ls-tree which made me forget to send the match_tree_entry fix :-/

That other ls-tree bug is with recursing into subdirectories, because
match_tree_entry matches even when the base is a subdirectory, but
ls-tree doesn't actually want that behaviour, I think. For example:

$ git ls-tree --abbrev HEAD git-gui/macosx/AppMain.tcl
100644 blob ddbe633	git-gui/macosx/AppMain.tcl

$ git ls-tree --abbrev HEAD  git-gui/
100644 blob f96112d	git-gui/.gitattributes
100644 blob 6483b21	git-gui/.gitignore
100755 blob b3f937e	git-gui/GIT-VERSION-GEN
100644 blob 3ad8a21	git-gui/Makefile
100755 blob 12e117e	git-gui/git-gui--askpass
100755 blob e018e07	git-gui/git-gui.sh
040000 tree f723285	git-gui/lib
040000 tree 73f3c34	git-gui/macosx
040000 tree 11cd1a0	git-gui/po
040000 tree 144728d	git-gui/windows

$ git ls-tree --abbrev HEAD git-gui/macosx/AppMain.tcl git-gui/
100644 blob f96112d	git-gui/.gitattributes
100644 blob 6483b21	git-gui/.gitignore
100755 blob b3f937e	git-gui/GIT-VERSION-GEN
100644 blob 3ad8a21	git-gui/Makefile
100755 blob 12e117e	git-gui/git-gui--askpass
100755 blob e018e07	git-gui/git-gui.sh
040000 tree f723285	git-gui/lib
100644 blob ddbe633	git-gui/macosx/AppMain.tcl
100644 blob b3bf15f	git-gui/macosx/Info.plist
100644 blob 77d88a7	git-gui/macosx/git-gui.icns
040000 tree 11cd1a0	git-gui/po
040000 tree 144728d	git-gui/windows

The last ls-tree shows all entries from git-gui/macosx/, beacuse the
first pattern makes it descend into that tree and all entries are
matched by the git-gui/ prefix. So the combined ls-tree shows more than
what the individual calls show. Seems wrong to me, but I'm unsure how to
tackle that, assuming that match_tree_entry is right in allowing any
base that's a subdirectory of a specified pathspec.

Björn
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Junio C Hamano, (Mon Mar 30, 2:44 am)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Eric Wong, (Mon Mar 30, 1:41 pm)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Junio C Hamano, (Mon Mar 30, 2:05 pm)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Eric Wong, (Mon Mar 30, 6:58 pm)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Björn, (Tue Mar 31, 3:11 am)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Björn, (Tue Mar 31, 3:31 am)
Re: [PATCH] git-svn: fix ls-tree usage with dash-prefixed pa..., Björn, (Tue Mar 31, 5:41 am)
[PATCH] tree_entry_interesting: Only recurse when the pathsp..., Björn, (Tue Mar 31, 11:05 am)
Re: [PATCH] tree_entry_interesting: Only recurse when the pa..., Junio C Hamano, (Thu Apr 2, 12:32 am)
Re: [PATCH] tree_entry_interesting: Only recurse when the pa..., Björn, (Thu Apr 2, 7:38 am)
[PATCH] match_tree_entry(): a pathspec only matches at direc..., Junio C Hamano, (Thu Apr 2, 12:41 am)
Re: [PATCH] match_tree_entry(): a pathspec only matches at d..., Linus Torvalds, (Thu Apr 2, 12:36 pm)