diff options
| author | Stefan Beller <sbeller@google.com> | 2016-03-29 18:27:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-30 13:06:05 -0700 |
| commit | c1ab00fb267fb0166376ff2c81083ef2cada6d9d (patch) | |
| tree | af7643b302bae0a60c433e1deb8fd9fd9fccc2e4 /git-submodule.sh | |
| parent | ea2fa1040d14f1b7aab8fd78cc3ff4d41abc57a1 (diff) | |
| download | git-c1ab00fb267fb0166376ff2c81083ef2cada6d9d.tar.gz git-c1ab00fb267fb0166376ff2c81083ef2cada6d9d.tar.xz | |
submodule update --init: correct path handling in recursive submodules
When calling `git submodule init` from a recursive instance of
`git submodule update --recursive`, the reported path is wrong as it
skips the nested submodules.
The new test demonstrates a failure in the code prior to this patch.
Instead of getting the expected
Submodule 'submodule' (${pwd}/submodule) registered for path '../super/submodule'
the `super` directory is omitted and you get
Submodule 'submodule' (${pwd}/submodule) registered for path '../submodule'
instead.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index b3f248c3f..9fffa5c54 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -473,7 +473,7 @@ cmd_init() die_if_unmatched "$mode" name=$(git submodule--helper name "$sm_path") || exit - displaypath=$(relative_path "$sm_path") + displaypath=$(relative_path "$prefix$sm_path") # Copy url setting when it is not set yet if test -z "$(git config "submodule.$name.url")" |