Re: [PATCH] format-patch: autonumber by default
- From
Jeff King <peff@peff.net>
- Date
- Oct 2, 2008, 21:06 UTC
- Message-ID
- <20081002210611.GA29480@coredump.intra.peff.net>
- In-Reply-To
- <1222978500-5780-1-git-send-email-giuseppe.bilotta@gmail.com>
On Thu, Oct 02, 2008 at 10:15:00PM +0200, Giuseppe Bilotta wrote:
> Documentation/config.txt | 5 +++-- > Documentation/git-format-patch.txt | 9 ++++++--- > builtin-log.c | 6 +++++- > 3 files changed, 14 insertions(+), 6 deletions(-)
Thanks, the documentation updates look good to me. There are also some updates required in t4013 (since the expected outputs for some instances will now be numbered) and t4020 (which explicitly checks that the default is no numbering). Probably t4020 should be modified in light of the new default, like so:
--- t/t4021-format-patch-numbered.sh | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh index 43d64bb..390af23 100755 --- a/t/t4021-format-patch-numbered.sh +++ b/t/t4021-format-patch-numbered.sh @@ -45,17 +45,22 @@ test_numbered() { grep "^Subject: \[PATCH 2/2\]" $1 } -test_expect_success 'Default: no numbered' ' +test_expect_success 'single patch defaults to no numbers' ' + git format-patch --stdout HEAD~1 >patch0.single && + test_single_no_numbered patch0.single +' + +test_expect_success 'multiple patch defaults to numbered' ' - git format-patch --stdout HEAD~2 >patch0 && - test_no_numbered patch0 + git format-patch --stdout HEAD~2 >patch0.multiple && + test_numbered patch0.multiple ' test_expect_success 'Use --numbered' ' - git format-patch --numbered --stdout HEAD~2 >patch1 && - test_numbered patch1 + git format-patch --numbered --stdout HEAD~1 >patch1 && + test_single_numbered patch1 '
-- 1.6.0.2.570.g2c958