diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-11-25 13:02:16 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-11-26 14:21:26 -0800 |
| commit | b018c73526ca9d941c64d6a41d9c24968de38c2b (patch) | |
| tree | ec19821f24d1c599507a814c82b047789d0c4eb5 /t/t6031-merge-recursive.sh | |
| parent | contrib: remove git-p4import (diff) | |
| download | tgif-b018c73526ca9d941c64d6a41d9c24968de38c2b.tar.xz | |
test: make FILEMODE a lazy prereq
This way, test authors don't need to remember to source
lib-prereq-FILEMODE.sh before using the FILEMODE prereq to guard tests
that rely on the executable bit being honored when checking out files.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 1cd649e245..a953f1b55c 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -2,7 +2,6 @@ test_description='merge-recursive: handle file mode' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh test_expect_success 'mode change in one branch: keep changed version' ' : >file1 && |