[PATCH] Fix t6031 on filesystems without working exec bit
From: Alex Riesen <hidden>
Date: 2016-06-15 22:44:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
The point of the test is not really to test the ability of the filesystem to keep the given x-bit, but to check is merge-recursive correctly handles it. Signed-off-by: Alex Riesen <redacted> --- t/t6031-merge-recursive.sh | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index c8310ae..f1c91c8 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh@@ -12,8 +12,7 @@ test_expect_success 'mode change in one branch: keep changed version' ' git add dummy && git commit -m a && git checkout -b b1 master && - chmod +x file1 && - git add file1 && + git update-index --chmod=+x file1 && git commit -m b1 && git checkout a1 && git merge-recursive master -- a1 b1 &&
@@ -25,8 +24,7 @@ test_expect_success 'mode change in both branches: expect conflict' ' git checkout -b a2 master && : >file2 && H=$(git hash-object file2) && - chmod +x file2 && - git add file2 && + git update-index --add --chmod=+x file2 && git commit -m a2 && git checkout -b b2 master && : >file2 &&
--
1.5.5.1.354.g902c