diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:49:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:49:16 -0700 |
| commit | 488ee2fe21ca69b90aa2b43dc9e30279a12cca63 (patch) | |
| tree | e14ba9c4319862646ac3b49076e44d4b5870d8b6 /t | |
| parent | b84c343c885b8168047b2773b5c597d04337d9bd (diff) | |
| parent | 28f880241782024ecb212f1641c8dc487124523b (diff) | |
| download | git-488ee2fe21ca69b90aa2b43dc9e30279a12cca63.tar.gz git-488ee2fe21ca69b90aa2b43dc9e30279a12cca63.tar.xz | |
Merge branch 'ar/t6031'
* ar/t6031:
Fix t6031 on filesystems without working exec bit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index c8310aee4..8073e0c3e 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -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 && @@ -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 && @@ -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 && |