From fe6beab7e80565dac81125aa82521f7673905ebc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 4 Dec 2008 17:08:48 -0800 Subject: Test that git-am does not lose -C/-p/--whitespace options These tests make sure that "git am" does not lose command line options specified when it was started, after it is interrupted by a patch that does not apply earlier in the series. Signed-off-by: Junio C Hamano --- t/t4252/am-test-2-1 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 t/t4252/am-test-2-1 (limited to 't/t4252/am-test-2-1') diff --git a/t/t4252/am-test-2-1 b/t/t4252/am-test-2-1 new file mode 100644 index 0000000000..feda94a0cc --- /dev/null +++ b/t/t4252/am-test-2-1 @@ -0,0 +1,19 @@ +From: A U Thor +Date: Thu Dec 4 16:00:00 2008 -0800 +Subject: Three + +Application of this should be rejected even with -C1 because the +preimage line in the context does not match. + +diff --git i/file-1 w/file-1 +index 06e567b..10f8342 100644 +--- i/file-1 ++++ w/file-1 +@@ -1,6 +1,6 @@ + 1 + 2 +-Tres ++Three + 4 + 5 + 6 -- cgit v1.2.3