From 278924204288aa622d1ab319eaee08d8972d2d2b Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 18 Mar 2009 13:31:38 +0100 Subject: [PATCH] t6031-merge-recursive: More fixes for exec bit challenged filesystems Commit 28f880241782024ecb212f1641c8dc487124523b improved the tests to work on filesystems that do not honor the exec bit, but it didn't go the full nine yards: If chmod +x does not work, then test -x will not work reliably, either, which was the only way how the tests checked the result. This patch works around the issue by testing the index if the filesystem does not report that the exec bit is set. Signed-off-by: Johannes Sixt --- t/t6031-merge-recursive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 8073e0c3ef..02aafa6d56 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -20,7 +20,7 @@ test_expect_success 'mode change in one branch: keep changed version' ' git commit -m b1 && git checkout a1 && git merge-recursive master -- a1 b1 && - test -x file1 + { test -x file1 || git ls-files -s file1 | grep ^100755; } ' test_expect_success 'mode change in both branches: expect conflict' ' @@ -46,7 +46,7 @@ test_expect_success 'mode change in both branches: expect conflict' ' echo "100644 $H 3 file2" ) >expect && test_cmp actual expect && - test -x file2 + { test -x file2 || git ls-files -s file2 | grep ^100755; } ' test_done -- 2.11.4.GIT