kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cb/aix' 

* cb/aix:
  tests: don't rely on strerror text when testing rmdir failure
  dir.c: make git_fnmatch() not inline
maint
Junio C Hamano 2014-04-03 12:38:38 -07:00
parent 400ecca8c1 11b5390251
commit 8ba87adad6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dir.c
View File

@ -54,9 +54,9 @@ int fnmatch_icase(const char *pattern, const char *string, int flags)
NULL); NULL);
} }


inline int git_fnmatch(const struct pathspec_item *item, int git_fnmatch(const struct pathspec_item *item,
const char *pattern, const char *string, const char *pattern, const char *string,
int prefix) int prefix)
{ {
if (prefix > 0) { if (prefix > 0) {
if (ps_strncmp(item, pattern, string, prefix)) if (ps_strncmp(item, pattern, string, prefix))

3
t/t3600-rm.sh
View File

@ -711,8 +711,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
git submodule update && git submodule update &&
git checkout -q HEAD^ 2>actual && git checkout -q HEAD^ 2>actual &&
git checkout -q master 2>actual && git checkout -q master 2>actual &&
echo "warning: unable to rmdir submod: Directory not empty" >expected && test_i18ngrep "^warning: unable to rmdir submod:" actual &&
test_i18ncmp expected actual &&
git status -s submod >actual && git status -s submod >actual &&
echo "?? submod/" >expected && echo "?? submod/" >expected &&
test_cmp expected actual && test_cmp expected actual &&

3
t/t7001-mv.sh
View File

@ -447,8 +447,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git mv sub sub2 && git mv sub sub2 &&
git commit -m "moved sub to sub2" && git commit -m "moved sub to sub2" &&
git checkout -q HEAD^ 2>actual && git checkout -q HEAD^ 2>actual &&
echo "warning: unable to rmdir sub2: Directory not empty" >expected && test_i18ngrep "^warning: unable to rmdir sub2:" actual &&
test_i18ncmp expected actual &&
git status -s sub2 >actual && git status -s sub2 >actual &&
echo "?? sub2/" >expected && echo "?? sub2/" >expected &&
test_cmp expected actual && test_cmp expected actual &&