1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Find a file
Nguyễn Thái Ngọc Duy 3a078dec33 wildmatch: fix "**" special case
"**" is adjusted to only be effective when surrounded by slashes, in
40bbee0 (wildmatch: adjust "**" behavior - 2012-10-15). Except that
the commit did it wrong:

1. when it checks for "the preceding slash unless ** is at the
   beginning", it compares to wrong pointer. It should have compared
   to the beginning of the pattern, not the text.

2. prev_p points to the character before "**", not the first "*". The
   correct comparison must be "prev_p < pattern" or
   "prev_p + 1 == pattern", not "prev_p == pattern".

3. The pattern must be surrounded by slashes unless it's at the
   beginning or the end of the pattern. We do two checks: one for the
   preceding slash and one the trailing slash. Both checks must be
   met. The use of "||" is wrong.

This patch fixes all above.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-01 15:31:18 -08:00
block-sha1 Merge branch 'jn/block-sha1' into maint 2012-08-06 15:40:00 -07:00
builtin Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11 2012-09-14 20:48:31 -07:00
compat Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11 2012-08-24 12:05:11 -07:00
contrib Make the ciabot scripts completely self-configuring in the normal case. 2012-08-23 20:58:24 -07:00
Documentation Support "**" wildcard in .gitignore and .gitattributes 2012-10-15 14:58:19 -07:00
git-gui
git_remote_helpers
gitk-git Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 2012-09-14 20:45:55 -07:00
gitweb Merge branch 'js/gitweb-path-info-unquote' into maint-1.7.11 2012-09-10 15:23:46 -07:00
mergetools
perl
po Update Swedish translation (1066t0f0u) 2012-07-01 23:04:09 +01:00
ppc
t wildmatch: fix "**" special case 2013-01-01 15:31:18 -08:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore Integrate wildmatch to git 2012-10-15 14:58:17 -07:00
.mailmap
abspath.c
aclocal.m4
advice.c Merge branch 'jk/maint-advise-vaddf' into maint 2012-07-30 13:05:25 -07:00
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c attr: more matching optimizations from .gitignore 2012-10-15 14:57:17 -07:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/maint-config-exit-status' into maint-1.7.11 2012-09-11 11:09:09 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
command-list.txt
commit.c
commit.h
config.c
config.mak.in
configure.ac
connect.c
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c ctype: support iscntrl, ispunct, isxdigit and isprint 2012-10-15 14:58:16 -07:00
daemon.c
date.c Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c diff: do not use null sha1 as a sentinel value 2012-07-29 15:04:32 -07:00
diff-no-index.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
diff.c Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11 2012-09-11 11:08:30 -07:00
diff.h Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diffcore.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
dir.c Support "**" wildcard in .gitignore and .gitattributes 2012-10-15 14:58:19 -07:00
dir.h attr: more matching optimizations from .gitignore 2012-10-15 14:57:17 -07:00
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fmt-merge-msg.h
fsck.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl git-add--interactive.perl: Remove two unused variables 2012-06-25 10:06:09 -07:00
git-am.sh Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint 2012-07-30 13:04:39 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h ctype: support iscntrl, ispunct, isxdigit and isprint 2012-10-15 14:58:16 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: support --tool-help option like difftool does 2012-07-23 14:42:39 -07:00
git-mergetool.sh mergetool: style fixes 2012-08-23 21:30:51 -07:00
git-p4.py
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11 2012-09-10 15:26:03 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl send-email: improve RFC2047 quote parsing 2012-07-31 15:05:53 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11 2012-09-10 15:25:45 -07:00
git-stash.sh Merge branch 'ph/stash-rerere' into maint-1.7.11 2012-09-11 11:10:12 -07:00
git-submodule.sh Merge branch 'sz/submodule-force-update' into maint-1.7.11 2012-09-11 11:10:17 -07:00
git-svn.perl
GIT-VERSION-GEN Git 1.7.11.7 2012-09-14 20:57:23 -07:00
git-web--browse.sh
git.c
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11 2012-09-12 13:58:23 -07:00
http.h http: factor out http error code handling 2012-08-27 10:49:09 -07:00
ident.c split_ident_line(): make best effort when parsing author/committer line 2012-08-31 14:54:18 -07:00
imap-send.c
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Integrate wildmatch to git 2012-10-15 14:58:17 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
merge-recursive.h
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
notes-merge.h
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c diff_setup_done(): return void 2012-08-03 12:11:07 -07:00
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'nd/index-errno' into maint-1.7.11 2012-09-11 10:53:21 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Git 1.7.11.7 2012-09-14 20:57:23 -07:00
remote-curl.c http: prompt for credentials on failed POST 2012-08-27 10:49:09 -07:00
remote.c Merge branch 'jk/push-delete-ref-error-message' into maint 2012-07-22 13:04:25 -07:00
remote.h
replace_object.c
rerere.c rerere: make rr-cache fanout directory honor umask 2012-07-09 16:27:49 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11 2012-09-12 14:00:34 -07:00
revision.h
run-command.c Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 2012-09-11 11:09:19 -07:00
run-command.h
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c setup: clarify error messages for file/revisions ambiguity 2012-08-03 09:06:30 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'hv/link-alt-odb-entry' into maint 2012-08-15 13:36:47 -07:00
sha1_name.c Merge branch 'mm/verify-filename-fix' into maint 2012-07-11 12:45:49 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-credential.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-regex.c test-regex: Add a test to check for a bug in the regex routines 2012-09-02 18:57:21 -07:00
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-subprocess.c
test-svn-fe.c
test-wildmatch.c test-wildmatch: avoid Windows path mangling 2012-11-20 12:09:13 -08:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
transport.h
tree-diff.c Merge branch 'tr/void-diff-setup-done' into maint-1.7.11 2012-09-11 10:53:40 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
unpack-trees.h
upload-pack.c
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
walker.c
walker.h
wildmatch.c wildmatch: fix "**" special case 2013-01-01 15:31:18 -08:00
wildmatch.h wildmatch: adjust "**" behavior 2012-10-15 14:58:18 -07:00
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://marc.theaimsgroup.com/?l=git and other archival
sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.