Merge branch 'jc/magic-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 16:58:35 +0000 (09:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2011 16:58:35 +0000 (09:58 -0700)
* jc/magic-pathspec:
setup.c: Fix some "symbol not declared" sparse warnings
t3703: Skip tests using directory name ":" on Windows
revision.c: leave a note for "a lone :" enhancement
t3703, t4208: add test cases for magic pathspec
rev/path disambiguation: further restrict "misspelled index entry" diag
fix overslow :/no-such-string-ever-existed diagnostics
fix overstrict :<path> diagnosis
grep: use get_pathspec() correctly
pathspec: drop "lone : means no pathspec" from get_pathspec()
Revert "magic pathspec: add ":(icase)path" to match case insensitively"
magic pathspec: add ":(icase)path" to match case insensitively
magic pathspec: futureproof shorthand form
magic pathspec: add tentative ":/path/from/top/level" pathspec support

1  2 
builtin/grep.c
cache.h
git-compat-util.h
revision.c
setup.c
sha1_name.c
diff --cc builtin/grep.c
Simple merge
diff --cc cache.h
Simple merge
Simple merge
diff --cc revision.c
Simple merge
diff --cc setup.c
Simple merge
diff --cc sha1_name.c
Simple merge