X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4150-am.sh;h=ccc0280f52232e845f9d7c7bd5c3326b412d4a96;hb=9eefd8ae8a955f470d931c13b8711d98f4e9d56e;hp=6f77fffee60b5e37140dc8952c95144035ed457a;hpb=31e3d834b39b773831c3c3e2637f2d99bfad9cbf;p=git.git

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 6f77fffee..ccc0280f5 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -123,6 +123,7 @@ test_expect_success setup '
 	git commit -m "added another file" &&
 
 	git format-patch --stdout master >lorem-move.patch &&
+	git format-patch --no-prefix --stdout master >lorem-zero.patch &&
 
 	git checkout -b rename &&
 	git mv file renamed &&
@@ -286,6 +287,20 @@ test_expect_success 'am -3 falls back to 3-way merge' '
 	git diff --exit-code lorem
 '
 
+test_expect_success 'am -3 -p0 can read --no-prefix patch' '
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b lorem3 master2 &&
+	sed -n -e "3,\$p" msg >file &&
+	head -n 9 msg >>file &&
+	git add file &&
+	test_tick &&
+	git commit -m "copied stuff" &&
+	git am -3 -p0 lorem-zero.patch &&
+	! test -d .git/rebase-apply &&
+	git diff --exit-code lorem
+'
+
 test_expect_success 'am can rename a file' '
 	grep "^rename from" rename.patch &&
 	rm -fr .git/rebase-apply &&