From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2013 21:50:42 +0000 (-0700)
Subject: Merge branch 'nd/magic-pathspec'
X-Git-Tag: v1.8.5-rc0~158
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fadf96abaa5f42c4bb7b4b5017926779c23d8ef3

Merge branch 'nd/magic-pathspec'

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
---

fadf96abaa5f42c4bb7b4b5017926779c23d8ef3
diff --cc pathspec.h
index 04b632fa33,04b632fa33..944baeb622
--- a/pathspec.h
+++ b/pathspec.h
@@@ -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() */