From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, jacob.keller@gmail.com
Subject: Re: [PATCHv4 1/6] submodule foreach: correct path display in recursive submodules
Date: Wed, 30 Mar 2016 13:05:25 -0700 [thread overview]
Message-ID: <xmqqy48zspdm.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1459301266-12403-2-git-send-email-sbeller@google.com> (Stefan Beller's message of "Tue, 29 Mar 2016 18:27:41 -0700")
Stefan Beller <sbeller@google.com> writes:
> The `prefix` was put in front of the display path unconditionally.
> This is wrong as any relative path computation would need to be at
> the front, so include the prefix into the display path.
>
> The new test replicates the previous test with the difference of executing
> from a sub directory. By executing from a sub directory all we would
> expect all displayed paths to be prefixed by '../'.
>
> Prior to this patch the test would report
> Entering 'nested1/nested2/../nested3'
> instead of the expected
> Entering '../nested1/nested2/nested3'
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
Definitely easier to read and helps understand what is going on in
the changed codepath much better. Very well done.
Thanks.
> diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
> index 7ca10b8..776b349 100755
> --- a/t/t7407-submodule-foreach.sh
> +++ b/t/t7407-submodule-foreach.sh
> @@ -178,6 +178,26 @@ test_expect_success 'test messages from "foreach --recursive"' '
> '
>
> cat > expect <<EOF
> +Entering '../nested1'
> +Entering '../nested1/nested2'
> +Entering '../nested1/nested2/nested3'
> +Entering '../nested1/nested2/nested3/submodule'
> +Entering '../sub1'
> +Entering '../sub2'
> +Entering '../sub3'
> +EOF
> +
> +test_expect_success 'test messages from "foreach --recursive" from subdirectory' '
> + (
> + cd clone2 &&
> + mkdir untracked &&
> + cd untracked &&
> + git submodule foreach --recursive >../../actual
> + ) &&
> + test_i18ncmp expect actual
> +'
> +
> +cat > expect <<EOF
> nested1-nested1
> nested2-nested2
> nested3-nested3
next prev parent reply other threads:[~2016-03-30 20:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 1:27 [PATCHv4 0/6] Fix path bugs in submodule commands executed from sub dir Stefan Beller
2016-03-30 1:27 ` [PATCHv4 1/6] submodule foreach: correct path display in recursive submodules Stefan Beller
2016-03-30 20:05 ` Junio C Hamano [this message]
2016-03-30 1:27 ` [PATCHv4 2/6] submodule update --init: correct path handling " Stefan Beller
2016-03-30 1:27 ` [PATCHv4 3/6] submodule status: " Stefan Beller
2016-03-30 1:27 ` [PATCHv4 4/6] submodule update: align reporting path for custom command execution Stefan Beller
2016-03-30 1:27 ` [PATCHv4 5/6] submodule update: test recursive path reporting from subdirectory Stefan Beller
2016-03-30 1:27 ` [PATCHv4 6/6] t7407: make expectation as clear as possible Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy48zspdm.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.