diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2015-10-12 10:03:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-12 10:36:16 -0700 |
| commit | 3a692b3c87e5433ab0a98f1307486c9956408e30 (patch) | |
| tree | 62b4fc358c6753430fef0470408aa7d836b8b611 | |
| parent | 22f698cb188243b313e024d618283e0293e37140 (diff) | |
| download | git-3a692b3c87e5433ab0a98f1307486c9956408e30.tar.gz | |
git-p4: avoid "stat" command in t9815 git-p4-submit-fail
Replace the stat command with the ls command to check file mode
bits. The stats command is not available on Windows and has
different command line options on OS X.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9815-git-p4-submit-fail.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh index 4cff6a760f..37b42d03a2 100755 --- a/t/t9815-git-p4-submit-fail.sh +++ b/t/t9815-git-p4-submit-fail.sh @@ -417,11 +417,8 @@ test_expect_success 'cleanup chmod after submit cancel' ' ! p4 fstat -T action text && test_path_is_file text+x && ! p4 fstat -T action text+x && - if test_have_prereq !CYGWIN - then - stat --format=%A text | egrep ^-r-- && - stat --format=%A text+x | egrep ^-r-x - fi + ls -l text | egrep ^-r-- && + ls -l text+x | egrep ^-r-x ) ' |