summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-28 09:32:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-28 09:32:44 (GMT)
commitc1d1128bef97ae16a6740538abe5fb81c67ed239 (patch)
tree84ca6ecab00b305d14b7604ef9c182416188dfa3
parent55e1805dffeb5d2a8ccd717b2d07ca8887436a69 (diff)
downloadgit-c1d1128bef97ae16a6740538abe5fb81c67ed239.zip
git-c1d1128bef97ae16a6740538abe5fb81c67ed239.tar.gz
git-c1d1128bef97ae16a6740538abe5fb81c67ed239.tar.bz2
git-am --resolved: more usable error message.
After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-am.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index eab4aa8..872145b 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -376,6 +376,13 @@ do
echo "No changes - did you forget update-index?"
stop_here $this
fi
+ unmerged=$(git-ls-files -u)
+ if test -n "$unmerged"
+ then
+ echo "You still have unmerged paths in your index"
+ echo "did you forget update-index?"
+ stop_here $this
+ fi
apply_status=0
;;
esac