git-am --resolved: more usable error message.
authorJunio C Hamano <junkio@cox.net>
Fri, 28 Apr 2006 09:32:44 +0000 (02:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Apr 2006 09:32:44 +0000 (02:32 -0700)
commitc1d1128bef97ae16a6740538abe5fb81c67ed239
tree84ca6ecab00b305d14b7604ef9c182416188dfa3
parent55e1805dffeb5d2a8ccd717b2d07ca8887436a69
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>
git-am.sh