diff options
| author | Stefan Beller <sbeller@google.com> | 2016-03-29 18:27:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 13:09:36 -0700 |
| commit | b08238ac3f5e4033d26824afc65e7397fbb61847 (patch) | |
| tree | a523e8ec86c3c743d8b608488c1e5e35c480d668 /git-submodule.sh | |
| parent | 10450cf72b51baf3bac6a779fb4e47241af7ae5e (diff) | |
| download | git-b08238ac3f5e4033d26824afc65e7397fbb61847.tar.gz git-b08238ac3f5e4033d26824afc65e7397fbb61847.tar.xz | |
submodule update: align reporting path for custom command execution
In the predefined actions (merge, rebase, none, checkout), we use
the display path, which is relative to the current working directory.
Also use the display path when running a custom command.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 1024774f6..753a90d30 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -802,8 +802,8 @@ Maybe you want to use 'update --init'?")" ;; !*) command="${update_module#!}" - die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$prefix\$sm_path'")" - say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': '\$command \$sha1'")" + die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")" + say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")" must_die_on_failure=yes ;; *) |