From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v4 0/4] Introduce diff.submodule
Date: Fri, 16 Nov 2012 16:15:02 +0530 [thread overview]
Message-ID: <CALkWK0k65oyz1FWdyjjHLjj-DS75cdfk_8Vd3NV4OwzS+--VaA@mail.gmail.com> (raw)
In-Reply-To: <20121115163356.GF6157@sigill.intra.peff.net>
Jeff King wrote:
> It may be worth squashing this test into patch 3:
Looks good. Thanks.
> BTW, while writing the test, I noticed two minor nits with your tests:
>
> 1. They can use test_config, which is simpler (you do not need to
> unset yourself after the test) and safer (the unset happens via
> test_when_finished, so it works even if the test fails).
I see. Can you squash this in?
-- 8< --
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index e401814..876800f 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -56,7 +56,7 @@ EOF
"
test_expect_success '--submodule=short overrides diff.submodule' "
- git config diff.submodule log &&
+ test_config diff.submodule log &&
git add sm1 &&
git diff --submodule=short --cached >actual &&
cat >expected <<-EOF &&
@@ -68,7 +68,6 @@ index 0000000..a2c4dab
@@ -0,0 +1 @@
+Subproject commit $fullhead1
EOF
- git config --unset diff.submodule &&
test_cmp expected actual
"
> 2. You can still indent expected output when using <<-.
I know; however, I wanted to be consistent with the surrounding code.
Ram
prev parent reply other threads:[~2012-11-16 10:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <http://mid.gmane.org/1352653146-3932-1-git-send-email-artagnon@gmail.com>
2012-11-13 15:42 ` [PATCH v4 0/4] Introduce diff.submodule Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 1/4] Documentation: move diff.wordRegex from config.txt to diff-config.txt Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 2/4] diff: introduce diff.submodule configuration variable Ramkumar Ramachandra
2012-11-20 0:48 ` Junio C Hamano
2012-11-22 9:40 ` Ramkumar Ramachandra
2012-11-22 9:44 ` Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 3/4] diff: rename "set" variable Ramkumar Ramachandra
2012-11-13 15:42 ` [PATCH v4 4/4] submodule: display summary header in bold Ramkumar Ramachandra
2012-11-15 16:23 ` [PATCH v4 0/4] Introduce diff.submodule Jeff King
2012-11-15 16:25 ` Jeff King
2012-11-15 16:33 ` Jeff King
2012-11-16 10:45 ` Ramkumar Ramachandra [this message]
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=CALkWK0k65oyz1FWdyjjHLjj-DS75cdfk_8Vd3NV4OwzS+--VaA@mail.gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).