]> git.ipfire.org Git - thirdparty/git.git/commitdiff
submodule: show full path in error message
authorJohn Keeping <john@keeping.me.uk>
Sun, 16 Jun 2013 14:18:16 +0000 (15:18 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2013 20:30:01 +0000 (13:30 -0700)
When --recursive was added to "submodule foreach" in commit 15fc56a (git
submodule foreach: Add --recursive to recurse into nested submodules,
2009-08-19), the error message when the script returns a non-zero status
was not updated to contain $prefix to show the full path.  Fix this.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-submodule.sh

index 79bfaac9d4cb9a04e5e1fd7675d740cf9fc27e87..bdb438ba4f7a4de297f8ed0340f8a82ad5e815a5 100755 (executable)
@@ -485,7 +485,7 @@ cmd_foreach()
                                        cmd_foreach "--recursive" "$@"
                                fi
                        ) <&3 3<&- ||
-                       die "$(eval_gettext "Stopping at '\$sm_path'; script returned non-zero status.")"
+                       die "$(eval_gettext "Stopping at '\$prefix\$sm_path'; script returned non-zero status.")"
                fi
        done
 }