diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-13 20:40:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 19:43:23 (GMT) |
| commit | 535d9742852e12a4d4cfc878eb2e734df70a8f22 (patch) | |
| tree | 18097d029fabb52d656ab670ff50ceefd7edfd6c /t/t6031-merge-recursive.sh | |
| parent | 617344d77bf2a11b507fb74160b14e5b7476f8ad (diff) | |
| download | git-535d9742852e12a4d4cfc878eb2e734df70a8f22.zip git-535d9742852e12a4d4cfc878eb2e734df70a8f22.tar.gz git-535d9742852e12a4d4cfc878eb2e734df70a8f22.tar.bz2 | |
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
Change the five tests that were all checking "git config --bool
core.filemode" to use a new FILEMODE prerequisite in
lib-prereq-FILEMODE.sh.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 8a3304f..66167e3 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -2,11 +2,7 @@ test_description='merge-recursive: handle file mode' . ./test-lib.sh - -if ! test "$(git config --bool core.filemode)" = false -then - test_set_prereq FILEMODE -fi +. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh test_expect_success 'mode change in one branch: keep changed version' ' : >file1 && |