public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Jens Lehmann <Jens.Lehmann@web•de>
Cc: git@vger•kernel.org, jrnieder@gmail•com, judge.packham@gmail•com,
	"brian m. carlson" <sandals@crustytoothpaste•net>
Subject: Re: [PATCH v3 2/2] submodule: don't print status output with ignore=all
Date: Wed, 04 Sep 2013 13:57:39 -0700	[thread overview]
Message-ID: <xmqqli3cl2yk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <522791AE.8070103@web.de> (Jens Lehmann's message of "Wed, 04 Sep 2013 22:01:50 +0200")

Jens Lehmann <Jens.Lehmann@web•de> writes:

> Am 03.09.2013 21:53, schrieb Junio C Hamano:
>> Jens, I see 1/2 is the same as the previous one you already acked.
>
> Yep.
>
>> Does this update to 2/2 look good to you?  Sorry, but I lost track
>> of the discussion that led to this reroll, hence a ping.
>
> v3 fixes the bug Matthieu noticed, I only had some remarks to the
> new test Brian added. If you could replace his patch to t7401 with
> the following diff it's an ack from me on this one too.
>
> -------------------------8<---------------------------
> diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
> index ac2434c..81ae7c9 100755
> --- a/t/t7401-submodule-summary.sh
> +++ b/t/t7401-submodule-summary.sh
> @@ -104,6 +104,24 @@ EOF
>  	test_cmp expected actual
>  "
>
> +test_expect_success 'no ignore=all setting has any effect' "
> +	git config -f .gitmodules submodule.sm1.path sm1 &&
> +	git config -f .gitmodules submodule.sm1.ignore all &&
> +	git config submodule.sm1.ignore all &&
> +	git config diff.ignoreSubmodules all &&
> +	git submodule summary >actual &&
> +	cat >expected <<-EOF &&
> +* sm1 $head1...$head2 (1):
> +  > Add foo3
> +
> +EOF
> +	test_cmp expected actual &&
> +	git config --unset diff.ignoreSubmodules &&
> +	git config --remove-section submodule.sm1 &&
> +	git config -f .gitmodules --remove-section submodule.sm1
> +"
> +
> +
>  commit_file sm1 &&
>  head3=$(
>  	cd sm1 &&

Thanks.

The above patch makes the <<-EOF situation that already exists in
this script worse. The only reason we would say -EOF not EOF is
because we would want to indent the here-document to align with the
rest of the command sequence, so we should either indent with HT, or
drop the dash.  I suspect the original did it that way fearing that
someday the indentation of the submodule difference list might start
using HT, but I do not think that is likely to happen, so my vote
goes to keeping '-' and indenting.

We need a clean-up patch after this series settles.

next prev parent reply	other threads:[~2013-09-04 20:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-01 20:06 [PATCH v3 0/2] submodule: Don't print status output with submodule.<name>.ignore=all brian m. carlson
2013-09-01 20:06 ` [PATCH v3 1/2] submodule: fix confusing variable name brian m. carlson
2013-09-01 20:06 ` [PATCH v3 2/2] submodule: don't print status output with ignore=all brian m. carlson
2013-09-03 19:17   ` Jens Lehmann
2013-09-03 19:53   ` Junio C Hamano
2013-09-04 20:01     ` Jens Lehmann
2013-09-04 20:57       ` Junio C Hamano [this message]
2013-09-04 21:26         ` Jens Lehmann
2013-09-04  6:31   ` Matthieu Moy
2013-09-04 20:40     ` Jens Lehmann
2013-09-05  6:30       ` Matthieu Moy
2013-09-05  8:05         ` Matthieu Moy
2013-09-06  0:19         ` brian m. carlson

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=xmqqli3cl2yk.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=Jens.Lehmann@web$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=jrnieder@gmail$(echo .)com \
    --cc=judge.packham@gmail$(echo .)com \
    --cc=sandals@crustytoothpaste$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox