mirror of
https://github.com/git/git.git
synced 2024-11-25 10:54:00 +08:00
fe6beab7e8
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>
23 lines
388 B
Plaintext
23 lines
388 B
Plaintext
From: A U Thor <au.thor@example.com>
|
|
Date: Thu Dec 4 16:00:00 2008 -0800
|
|
Subject: Six
|
|
|
|
Applying this patch with -C1 -p2 should be successful even though
|
|
the patch is against a wrong level and the first context line does
|
|
not match.
|
|
|
|
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 @@
|
|
One
|
|
2
|
|
-3
|
|
+Three
|
|
4
|
|
5
|
|
-6
|
|
+Six
|
|
7
|