diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:38 -0700 |
| commit | 8ba87adad637b402fb309754e213ec40b74e4f18 (patch) | |
| tree | ca8a9e5b21b53890ae499ad60f636e0882c93c3e | |
| parent | Merge branch 'cn/fetch-prune-overlapping-destination' (diff) | |
| parent | tests: don't rely on strerror text when testing rmdir failure (diff) | |
| download | tgif-8ba87adad637b402fb309754e213ec40b74e4f18.tar.xz | |
Merge branch 'cb/aix'
* cb/aix:
tests: don't rely on strerror text when testing rmdir failure
dir.c: make git_fnmatch() not inline
| -rw-r--r-- | dir.c | 6 | ||||
| -rwxr-xr-x | t/t3600-rm.sh | 3 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 3 |
3 files changed, 5 insertions, 7 deletions
@@ -54,9 +54,9 @@ int fnmatch_icase(const char *pattern, const char *string, int flags) NULL); } -inline int git_fnmatch(const struct pathspec_item *item, - const char *pattern, const char *string, - int prefix) +int git_fnmatch(const struct pathspec_item *item, + const char *pattern, const char *string, + int prefix) { if (prefix > 0) { if (ps_strncmp(item, pattern, string, prefix)) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 3d305814b9..e00d7d2b61 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -711,8 +711,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ 2>actual && git checkout -q master 2>actual && - echo "warning: unable to rmdir submod: Directory not empty" >expected && - test_i18ncmp expected actual && + test_i18ngrep "^warning: unable to rmdir submod:" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 215d43d6a6..34fb1afbb3 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -447,8 +447,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u git mv sub sub2 && git commit -m "moved sub to sub2" && git checkout -q HEAD^ 2>actual && - echo "warning: unable to rmdir sub2: Directory not empty" >expected && - test_i18ncmp expected actual && + test_i18ngrep "^warning: unable to rmdir sub2:" actual && git status -s sub2 >actual && echo "?? sub2/" >expected && test_cmp expected actual && |