X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-am.sh;h=7cc4ae5a30ed3a56cff9def63e351f957cad6666;hb=6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1;hp=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hpb=1536dd9c61b5582cf079999057cb715dd6dc6620;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 98b9215f..7cc4ae5a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,11 +1,13 @@
#!/bin/sh
#
-#
+# Copyright (c) 2005, 2006 Junio C Hamano
USAGE='[--signoff] [--dotest=
] [--utf8] [--binary] [--3way]
or, when resuming [--skip | --resolved]'
. git-sh-setup
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
stop_here () {
echo "$1" >"$dotest/next"
exit 1
@@ -298,7 +300,7 @@ do
} >"$dotest/final-commit"
;;
*)
- case "$resolved,$interactive" in
+ case "$resolved$interactive" in
tt)
# This is used only for interactive view option.
git-diff-index -p --cached HEAD >"$dotest/patch"
@@ -362,6 +364,12 @@ do
# trust what the user has in the index file and the
# working tree.
resolved=
+ changed="$(git-diff-index --cached --name-only HEAD)"
+ if test '' = "$changed"
+ then
+ echo "No changes - did you forget update-index?"
+ stop_here $this
+ fi
apply_status=0
;;
esac
@@ -372,7 +380,7 @@ do
then
# Applying the patch to an earlier tree and merging the
# result may have produced the same tree as ours.
- changed="$(git-diff-index --cached --name-only -z HEAD)"
+ changed="$(git-diff-index --cached --name-only HEAD)"
if test '' = "$changed"
then
echo No changes -- Patch already applied.