unpack-trees(): carry skip-worktree bit over in merged_entry()

diff --git a/git-am.sh b/git-am.sh
index dd60f5d9cb6e8713551a5d3e93c40f9a0097a839..f719f6e654fdb7ee92013c824af439b5f0f58f95 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -268,7 +268,11 @@ split_patches () {
                msgnum=
                ;;
        *)
-               clean_abort "Patch format $patch_format is not supported."
+               if test -n "$parse_patch" ; then
+                       clean_abort "Patch format $patch_format is not supported."
+               else
+                       clean_abort "Patch format detection failed."
+               fi
                ;;
        esac
 }