summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-01-06 16:19:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-12 14:36:20 -0800
commit6e7c14e65c863b615a6a3abb2a3668b261008809 (patch)
tree765697984c3ee9cf4349cbbcba084368483e3aa7 /builtin/fmt-merge-msg.c
parentsubmodule: add absorb-git-dir function (diff)
downloadtgif-6e7c14e65c863b615a6a3abb2a3668b261008809.tar.xz
submodule update --init: display correct path from submodule
In the submodule helper we did not correctly handled the display path for initializing submodules when both the submodule is inside a subdirectory as well as the command being invoked from a subdirectory (as viewed from the superproject). This was broken in 3604242f080, which was written at a time where there was no super-prefix available, so we abused the --prefix option for the same purpose and could get only one case right (the call from within a subdirectory, not the submodule being in a subdirectory). Test-provided-by: David Turner <novalis@novalis.org> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions