From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 0/2] wrap format-patch diffstats around 72 columns
Date: Thu, 1 Feb 2018 19:47:48 +0700 [thread overview]
Message-ID: <20180201124750.15032-1-pclouds@gmail.com> (raw)
In-Reply-To: <20180125115927.16196-1-pclouds@gmail.com>
v3 fixes tests in 2/2 that I overlooked (but Jeff didn't). Interdiff:
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 1e62333b46..6e2cf933f7 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -19,17 +19,33 @@ test_expect_success 'preparation' '
git commit -m message "$name"
'
+cat >expect72 <<-'EOF'
+ ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
+EOF
+test_expect_success "format-patch: small change with long name gives more space to the name" '
+ git format-patch -1 --stdout >output &&
+ grep " | " output >actual &&
+ test_cmp expect72 actual
+'
+
while read cmd args
do
- cat >expect <<-'EOF'
+ cat >expect80 <<-'EOF'
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
EOF
test_expect_success "$cmd: small change with long name gives more space to the name" '
git $cmd $args >output &&
grep " | " output >actual &&
- test_cmp expect actual
+ test_cmp expect80 actual
'
+done <<\EOF
+diff HEAD^ HEAD --stat
+show --stat
+log -1 --stat
+EOF
+while read cmd args
+do
cat >expect <<-'EOF'
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
EOF
@@ -60,7 +76,7 @@ do
test_cmp expect actual
'
done <<\EOF
-format-patch --stat=80 -1 --stdout
+format-patch -1 --stdout
diff HEAD^ HEAD --stat
show --stat
log -1 --stat
Nguyễn Thái Ngọc Duy (2):
format-patch: keep cover-letter diffstat wrapped in 72 columns
format-patch: reduce patch diffstat width to 72
builtin/log.c | 7 ++++++-
t/t4052-stat-output.sh | 46 ++++++++++++++++++++++++++++--------------
2 files changed, 37 insertions(+), 16 deletions(-)
--
2.16.1.205.g271f633410
next prev parent reply other threads:[~2018-02-01 12:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 12:31 [PATCH] format-patch: set diffstat width to 70 instead of default 80 Nguyễn Thái Ngọc Duy
2018-01-22 23:13 ` Junio C Hamano
2018-01-22 23:52 ` Jeff King
2018-01-23 0:10 ` Ævar Arnfjörð Bjarmason
2018-01-23 0:12 ` Jeff King
2018-01-23 2:42 ` Duy Nguyen
2018-01-23 0:08 ` Ævar Arnfjörð Bjarmason
2018-01-25 11:59 ` [PATCH v2 0/2] wrap format-patch diffstats around 72 columns Nguyễn Thái Ngọc Duy
2018-01-25 11:59 ` [PATCH v2 1/2] format-patch: keep cover-letter diffstat wrapped in " Nguyễn Thái Ngọc Duy
2018-01-25 11:59 ` [PATCH v2 2/2] format-patch: reduce patch diffstat width to 72 Nguyễn Thái Ngọc Duy
2018-01-27 16:47 ` Jeff King
2018-01-30 10:22 ` Duy Nguyen
2018-01-27 16:48 ` [PATCH v2 0/2] wrap format-patch diffstats around 72 columns Jeff King
2018-02-01 12:47 ` Nguyễn Thái Ngọc Duy [this message]
2018-02-01 12:47 ` [PATCH v3 1/2] format-patch: keep cover-letter diffstat wrapped in " Nguyễn Thái Ngọc Duy
2018-02-01 12:47 ` [PATCH v3 2/2] format-patch: reduce patch diffstat width to 72 Nguyễn Thái Ngọc Duy
2018-02-02 18:42 ` [PATCH v3 0/2] wrap format-patch diffstats around 72 columns Junio C Hamano
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=20180201124750.15032-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).