submodule.c: report the submodule that an error occurs in

diff --git a/submodule.c b/submodule.c
index 29677043174f8d77d6774bc2533b653d03adf990..1b950f9627d92b9b101638467d590d59c83c6e59 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1657,11 +1657,13 @@ int submodule_move_head(const char *path,
        else
                argv_array_push(&cp.args, "-m");
 
-       argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
+       if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
+               argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
+
        argv_array_push(&cp.args, new ? new : EMPTY_TREE_SHA1_HEX);
 
        if (run_command(&cp)) {
-               ret = -1;
+               ret = error(_("Submodule '%s' could not be updated."), path);
                goto out;
        }