Merge branch 'lt/push' into next

diff --git a/git-am.sh b/git-am.sh
index eab4aa891e522539bb145c9702200d3a788e650c..872145b92dc7000eb1c87d548a46fa0d9522870d 100755 (executable)
--- 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