git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCHv4 1/6] submodule foreach: correct path display in recursive submodules

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 30, 2016, 20:05 UTC
Message-ID
<xmqqy48zspdm.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1459301266-12403-2-git-send-email-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 15 quoted lines
> 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.
Show 31 quoted lines
> 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
Previous: Stefan BellerNext: Stefan Beller
Message 3 of 8 in “[PATCHv4 0/6] Fix path bugs in submodule commands executed from sub dir”
  1. Stefan BellerMar 30, 2016
  2. 1/6 submodule foreach: correct path display in recursive submodulesStefan Beller, Mar 30, 2016
  3. Junio C HamanoMar 30, 2016
  4. 2/6 submodule update --init: correct path handling in recursive submodulesStefan Beller, Mar 30, 2016
  5. 3/6 submodule status: correct path handling in recursive submodulesStefan Beller, Mar 30, 2016
  6. 4/6 submodule update: align reporting path for custom command executionStefan Beller, Mar 30, 2016
  7. 5/6 submodule update: test recursive path reporting from subdirectoryStefan Beller, Mar 30, 2016
  8. 6/6 t7407: make expectation as clear as possibleStefan Beller, Mar 30, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.