From 46a2df8d4fec1798bb807bf14c28f398d606219b Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Tue, 18 Mar 2008 09:05:17 +0100
Subject: [PATCH] Skip t6031 if executable bit does not work.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
 t/t6031-merge-recursive.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c8310aee4f..a8ce5569cb 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -3,6 +3,11 @@
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
 
+if test "$(git config --bool core.filemode)" = false; then
+	say "executable bit not honored - skipping tests"
+	test_done
+fi
+
 test_expect_success 'mode change in one branch: keep changed version' '
 	: >file1 &&
 	git add file1 &&