From: Pat Thoyts Date: Thu, 03 Feb 2011 15:31:43 GMT Subject: [PATCH 2/4] t4120-apply-popt: help systems with core.filemode=false Message-ID: <1296747105-1663-3-git-send-email-patthoyts@users.sourceforge.net> In-Reply-To: <1296747105-1663-1-git-send-email-patthoyts@users.sourceforge.net> From: Johannes Sixt A test case verifies that filemode-only patches work as expected. Help systems where "test -x" does not work by applying the test patch also to the index, where the effects can be verified even on such systems. Signed-off-by: Johannes Sixt Signed-off-by: Pat Thoyts --- t/t4120-apply-popt.sh | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 579c9e6..a33d510 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -6,6 +6,7 @@ test_description='git apply -p handling.' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh test_expect_success setup ' mkdir sub && @@ -62,8 +63,12 @@ test_expect_success 'apply (-p2) diff, mode change only' ' old mode 100644 new mode 100755 EOF - chmod 644 file1 && - git apply -p2 patch.chmod && + test_chmod -x file1 && + git apply --index -p2 patch.chmod && + case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac +' + +test_expect_success FILEMODE 'file mode was changed' ' test -x file1 ' -- 1.7.4.msysgit.0