Skip to content

Commit

Permalink
Merge branch 'ar/t6031'
Browse files Browse the repository at this point in the history
* ar/t6031:
  Fix t6031 on filesystems without working exec bit
  • Loading branch information
Junio C Hamano committed May 25, 2008
2 parents b84c343 + 28f8802 commit 488ee2f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions t/t6031-merge-recursive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
test_description='merge-recursive: handle file mode'
. ./test-lib.sh

# Note that we follow "chmod +x F" with "update-index --chmod=+x F" to
# help filesystems that do not have the executable bit.

test_expect_success 'mode change in one branch: keep changed version' '
: >file1 &&
git add file1 &&
Expand All @@ -13,7 +16,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
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 &&
Expand All @@ -26,7 +29,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
: >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 &&
Expand Down

0 comments on commit 488ee2f

Please sign in to comment.