From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 413821F576 for ; Thu, 25 Jan 2018 12:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751904AbeAYMAB (ORCPT ); Thu, 25 Jan 2018 07:00:01 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:46107 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbeAYMAA (ORCPT ); Thu, 25 Jan 2018 07:00:00 -0500 Received: by mail-pg0-f66.google.com with SMTP id s9so4895671pgq.13 for ; Thu, 25 Jan 2018 04:00:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mU6ULvHGqHsYbe27AnggoOcNNflf+M5VxKSluSv6JQQ=; b=HMkUDTmrp8YRO3r3ZQ/cUFBnxdJYDh0fxQPcQq05Pq8+aCmUCAnXIEKiSjg8fGSdQO xOeCOUmzNCuaiX68L4upVB1TuDI137rLXJh9yx7ZHChEQ+y728EdTGiNqwm0Jehvjx9r 4lVM7d2jbCc71na0lCLj8LgBQItHEA2UAwBxGwjdNmKLNla8tzEXeDFQ9Cl7tbj/Ihvm l507x3LZMewTp2E0OSGRiUlGS+xc/nck6yQmGfm8fjcTA7vFeu7BA2kTXVMHQKXO90hX gQVkIpscsgGeZ5Cr1iCJcRHoWf31V6JYeVf5DluyloAqjCMVR4DVdzP4UdBpxa/Xvizg g+PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mU6ULvHGqHsYbe27AnggoOcNNflf+M5VxKSluSv6JQQ=; b=lEd0ecs4GZ2eL/9VBrSp+mojnwY3TIONsbz3mKMG3DrUs8U4yp/RaFCQeYMY0MofKB cN4+cCYscsOTOcBxnQKeos+xP+AIVq+1MiCjJBo1IdrHRrYeHUvHj0f6HQW9lBl1zbNP kokIiue4uaswPaPjjvuglslEwmzmtMa7PX6kFIyX2JSZKbf6CkkCwhMMWe4Hn8IxgO1Q hYmOMxhTUFng4SSErDphCK/o9cKRGmC8mvh7Mnp+D2xZtuiIHj3JhTegJF8yP+FrsrbZ QoVe6nUPtJ6BY3JitPusmwLTq6h+OgAsTo4QcQ4+RD41JWOeKBIXaXf/ewbEBTUJC2IO /Upg== X-Gm-Message-State: AKwxytelT8bjLlDgBLWUOrXF1Wavl4pDVIWKDmPQajSdvsVoJHxBKrfn NkL+4LX4OVOi65kcIJXZcrZkUA== X-Google-Smtp-Source: AH8x224zm7l++6JoUhS5ur9/gHopC8s7jcaCiJzjcZXNDGC0EPEOGp/SZCdUQagO8RDDn7Rtr+ooNw== X-Received: by 10.101.77.207 with SMTP id q15mr13294994pgt.163.1516881599758; Thu, 25 Jan 2018 03:59:59 -0800 (PST) Received: from ash ([171.233.110.59]) by smtp.gmail.com with ESMTPSA id p68sm13584011pfp.30.2018.01.25.03.59.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 03:59:59 -0800 (PST) Received: by ash (sSMTP sendmail emulation); Thu, 25 Jan 2018 18:59:54 +0700 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org Cc: Jeff King , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 2/2] format-patch: reduce patch diffstat width to 72 Date: Thu, 25 Jan 2018 18:59:27 +0700 Message-Id: <20180125115927.16196-3-pclouds@gmail.com> X-Mailer: git-send-email 2.16.1.200.g71ee9f6994 In-Reply-To: <20180125115927.16196-1-pclouds@gmail.com> References: <20180122123154.8301-1-pclouds@gmail.com> <20180125115927.16196-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Patches generated by format-patch are meant to be exchanged as emails, most of the time. And since it's generally agreed that text in mails should be wrapped around 70 columns or so, make sure these diffstat follow the convention (especially when used with --cover-letter since we already defaults to wrapping 72 columns). The default can still be overriden with command line options. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 2 ++ t/t4052-stat-output.sh | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 96af897403..94ee177d56 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1617,6 +1617,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) (!rev.diffopt.output_format || rev.diffopt.output_format == DIFF_FORMAT_PATCH)) rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY; + if (!rev.diffopt.stat_width) + rev.diffopt.stat_width = MAIL_DEFAULT_WRAP; /* Always generate a patch */ rev.diffopt.output_format |= DIFF_FORMAT_PATCH; diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index 9f563db20a..1e62333b46 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -60,7 +60,7 @@ do test_cmp expect actual ' done <<\EOF -format-patch -1 --stdout +format-patch --stat=80 -1 --stdout diff HEAD^ HEAD --stat show --stat log -1 --stat @@ -79,11 +79,11 @@ test_expect_success 'preparation for big change tests' ' git commit -m message abcd ' -cat >expect80 <<'EOF' - abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +cat >expect72 <<'EOF' + abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ EOF -cat >expect80-graph <<'EOF' -| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +cat >expect72-graph <<'EOF' +| abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ EOF cat >expect200 <<'EOF' abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -107,7 +107,7 @@ do test_cmp "$expect-graph" actual ' done <<\EOF -ignores expect80 format-patch -1 --stdout +ignores expect72 format-patch -1 --stdout respects expect200 diff HEAD^ HEAD --stat respects expect200 show --stat respects expect200 log -1 --stat @@ -135,7 +135,7 @@ do test_cmp "$expect-graph" actual ' done <<\EOF -ignores expect80 format-patch -1 --stdout +ignores expect72 format-patch -1 --stdout respects expect40 diff HEAD^ HEAD --stat respects expect40 show --stat respects expect40 log -1 --stat @@ -163,7 +163,7 @@ do test_cmp "$expect-graph" actual ' done <<\EOF -ignores expect80 format-patch -1 --stdout +ignores expect72 format-patch -1 --stdout respects expect40 diff HEAD^ HEAD --stat respects expect40 show --stat respects expect40 log -1 --stat @@ -250,11 +250,11 @@ show --stat log -1 --stat EOF -cat >expect80 <<'EOF' - ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++ +cat >expect72 <<'EOF' + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++ EOF -cat >expect80-graph <<'EOF' -| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++ +cat >expect72-graph <<'EOF' +| ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++ EOF cat >expect200 <<'EOF' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -278,7 +278,7 @@ do test_cmp "$expect-graph" actual ' done <<\EOF -ignores expect80 format-patch -1 --stdout +ignores expect72 format-patch -1 --stdout respects expect200 diff HEAD^ HEAD --stat respects expect200 show --stat respects expect200 log -1 --stat @@ -308,7 +308,7 @@ do test_cmp "$expect-graph" actual ' done <<\EOF -ignores expect80 format-patch -1 --stdout +ignores expect72 format-patch -1 --stdout respects expect1 diff HEAD^ HEAD --stat respects expect1 show --stat respects expect1 log -1 --stat -- 2.16.1.200.g71ee9f6994