diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-20 23:40:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-20 23:40:21 -0700 |
| commit | 208f689610e524ce9858f9d28635f7fea51b8d96 (patch) | |
| tree | 93dead7a7854cf96aaf025e9360536763edf3faf | |
| parent | f3f0c5188259182034b2c44d76c7158176e02d37 (diff) | |
| parent | 5610e3b0315d652d6b8e6535afe0e7e461c8a0a0 (diff) | |
| download | git-208f689610e524ce9858f9d28635f7fea51b8d96.tar.gz git-208f689610e524ce9858f9d28635f7fea51b8d96.tar.xz | |
Merge branch 'maint'
* maint:
Fix testcase failure when extended attributes are in use
| -rwxr-xr-x | t/t1301-shared-repo.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 2275caa31..653362ba2 100755 --- a/t/t1301-shared-repo.sh +++ b/t/t1301-shared-repo.sh @@ -20,6 +20,10 @@ test_expect_success 'shared = 0400 (faulty permission u-w)' ' test $ret != "0" ' +modebits () { + ls -l "$1" | sed -e 's|^\(..........\).*|\1|' +} + for u in 002 022 do test_expect_success "shared=1 does not clear bits preset by umask $u" ' @@ -85,8 +89,7 @@ do rm -f .git/info/refs && git update-server-info && - actual="$(ls -l .git/info/refs)" && - actual=${actual%% *} && + actual="$(modebits .git/info/refs)" && test "x$actual" = "x-$y" || { ls -lt .git/info false @@ -98,8 +101,7 @@ do rm -f .git/info/refs && git update-server-info && - actual="$(ls -l .git/info/refs)" && - actual=${actual%% *} && + actual="$(modebits .git/info/refs)" && test "x$actual" = "x-$x" || { ls -lt .git/info false |