From: John Keeping <john@keeping.me.uk>
Date: Sun, 16 Jun 2013 14:18:16 +0000 (+0100)
Subject: submodule: show full path in error message
X-Git-Tag: v1.8.4-rc0~107^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ae2e19a32729e21778b74f61794369203b58a1d;p=git

submodule: show full path in error message

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>
---

diff --git a/git-submodule.sh b/git-submodule.sh
index 79bfaac9d4..bdb438ba4f 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -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
 }