git am: Display some help text when patch is empty

artagnon · gitster · commit dc267b1ab4f8 · 2010-06-02T09:51:48.000-07:00
When a patch is found to be empty, prompt the user to use either
--skip or --abort.

Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-am.sh b/git-am.sh
@@ -592,6 +592,8 @@ do
 
 		test -s "$dotest/patch" || {
 			echo "Patch is empty.  Was it split wrong?"
+			echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
+			echo "To restore the original branch and stop patching run \"$cmdline --abort\"."
 			stop_here $this
 		}
 		rm -f "$dotest/original-commit"

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,8 @@ do`
`592`	`592`
`593`	`593`	`test -s "$dotest/patch" \|\| {`
`594`	`594`	`echo "Patch is empty. Was it split wrong?"`
	`595`	`+ echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."`
	`596`	`+ echo "To restore the original branch and stop patching run \"$cmdline --abort\"."`
`595`	`597`	`stop_here $this`
`596`	`598`	`}`
`597`	`599`	`rm -f "$dotest/original-commit"`