Re: fatal: git-write-tree: not able to write tree
From: <hidden>
Date: 2016-06-15 22:42:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
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
Er... it's very non-obvious to me why you'd want to stick a workaround here when you could instead fix git-write-tree to do it. That seems like The Right Thing. (It would also be helpful to mention at least one unmerged file by name.)