summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-3-2
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-12-04 17:08:48 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-12-04 18:45:02 -0800
commitfe6beab7e80565dac81125aa82521f7673905ebc (patch)
treebc814ba85441b34b519ec6a0631b37e51ea7de50 /t/t4252/am-test-3-2
parentgit-am: propagate --3way options as well (diff)
downloadtgif-fe6beab7e80565dac81125aa82521f7673905ebc.tar.xz
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 <gitster@pobox.com>
Diffstat (limited to 't/t4252/am-test-3-2')
-rw-r--r--t/t4252/am-test-3-221
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t4252/am-test-3-2 b/t/t4252/am-test-3-2
new file mode 100644
index 0000000000..0081b96f2a
--- /dev/null
+++ b/t/t4252/am-test-3-2
@@ -0,0 +1,21 @@
+From: A U Thor <au.thor@example.com>
+Date: Thu Dec 4 16:00:00 2008 -0800
+Subject: Six
+
+Applying this patch with -p2 should be successful even though
+the patch is against a wrong level.
+
+diff --git i/junk/file-2 w/junk/file-2
+index 06e567b..b6f3a16 100644
+--- i/junk/file-2
++++ w/junk/file-2
+@@ -1,7 +1,7 @@
+ 1
+ 2
+-3
++Three
+ 4
+ 5
+-6
++Six
+ 7