From: Junio C Hamano Date: Mon, 23 May 2011 16:58:35 +0000 (-0700) Subject: Merge branch 'jc/magic-pathspec' X-Git-Tag: v1.7.6-rc0~44 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be5ab43566a7f9ea663349dbb9d7e83e270b3396;p=git.git Merge branch 'jc/magic-pathspec' * 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 : 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 --- be5ab43566a7f9ea663349dbb9d7e83e270b3396