Merge branch 'nd/magic-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:50:42 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2013 21:50:44 +0000 (14:50 -0700)
Use "struct pathspec" interface in more places, instead of array of
characters, the latter of which cannot express magic pathspecs
(e.g. ":(icase)makefile" that matches both Makefile and makefile).

* nd/magic-pathspec:
add: lift the pathspec magic restriction on "add -p"
pathspec: catch prepending :(prefix) on pathspec with short magic

1  2 
builtin/add.c
builtin/checkout.c
pathspec.c
pathspec.h
diff --cc builtin/add.c
Simple merge
Simple merge
diff --cc pathspec.c
Simple merge
diff --cc pathspec.h
index 04b632fa3326defd3d119d88beadb296f8e4a722,04b632fa3326defd3d119d88beadb296f8e4a722..944baeb622cee4aeebb835d01982466cf2c2ce29
@@@ -14,7 -14,7 +14,7 @@@
         PATHSPEC_GLOB          | \
         PATHSPEC_ICASE)
  
--#define PATHSPEC_ONESTAR 1    /* the pathspec pattern sastisfies GFNM_ONESTAR */
++#define PATHSPEC_ONESTAR 1    /* the pathspec pattern satisfies GFNM_ONESTAR */
  
  struct pathspec {
        const char **_raw; /* get_pathspec() result, not freed by free_pathspec() */