From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Lucas De Marchi" <lucas.demarchi@intel.com>,
"Stefan Beller" <sbeller@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Stephen & Linda Smith" <ischis2@cox.net>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: Re: [PATCH v5 0/3] range-diff fixes
Date: Wed, 14 Nov 2018 16:36:55 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811141636350.39@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20181113185558.23438-1-avarab@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2502 bytes --]
Hi Ævar,
On Tue, 13 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Trivial updates since v4 addressing the feedback on that
> iteration. Hopefully this is the last one, range-diff with the last
> version:
This range-diff looks good to me.
Thanks,
Dscho
>
> 1: 5399e57513 = 1: f225173f43 range-diff doc: add a section about output stability
> 2: e56975df6c = 2: 77804ac641 range-diff: fix regression in passing along diff options
> 3: edfef733c7 ! 3: ed67dba073 range-diff: make diff option behavior (e.g. --stat) consistent
> @@ -17,8 +17,8 @@
>
> But we should behave consistently with "diff" in anticipation of such
> output being useful in the future, because it would make for confusing
> - UI if two "diff" and "range-diff" behaved differently when it came to
> - how they interpret diff options.
> + UI if "diff" and "range-diff" behaved differently when it came to how
> + they interpret diff options.
>
> The new behavior is also consistent with the existing documentation
> added in ba931edd28 ("range-diff: populate the man page",
> @@ -36,7 +36,7 @@
> memcpy(&opts, diffopt, sizeof(opts));
> - opts.output_format |= DIFF_FORMAT_PATCH;
> + if (!opts.output_format)
> -+ opts.output_format |= DIFF_FORMAT_PATCH;
> ++ opts.output_format = DIFF_FORMAT_PATCH;
> opts.flags.suppress_diff_headers = 1;
> opts.flags.dual_color_diffed_diffs = dual_color;
> opts.output_prefix = output_prefix_cb;
> @@ -45,6 +45,12 @@
> --- a/t/t3206-range-diff.sh
> +++ b/t/t3206-range-diff.sh
> @@
> + '
> +
> + test_expect_success 'changed commit with --stat diff option' '
> +- four_spaces=" " &&
> + git range-diff --no-color --stat topic...changed >actual &&
> + cat >expected <<-EOF &&
> 1: 4de457d = 1: a4b3333 s/5/A/
> a => b | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
>
> Ævar Arnfjörð Bjarmason (3):
> range-diff doc: add a section about output stability
> range-diff: fix regression in passing along diff options
> range-diff: make diff option behavior (e.g. --stat) consistent
>
> Documentation/git-range-diff.txt | 17 +++++++++++++++++
> range-diff.c | 3 ++-
> t/t3206-range-diff.sh | 30 ++++++++++++++++++++++++++++++
> 3 files changed, 49 insertions(+), 1 deletion(-)
>
> --
> 2.19.1.1182.g4ecb1133ce
>
>
next prev parent reply other threads:[~2018-11-14 15:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 20:06 [PATCH] range-diff: add a --no-patch option to show a summary Ævar Arnfjörð Bjarmason
2018-11-05 20:26 ` Eric Sunshine
2018-11-05 21:00 ` Ævar Arnfjörð Bjarmason
2018-11-06 10:43 ` Johannes Schindelin
2018-11-06 16:01 ` Ævar Arnfjörð Bjarmason
2018-11-07 10:34 ` Johannes Schindelin
2018-11-07 10:43 ` Johannes Schindelin
2018-11-07 10:55 ` Johannes Schindelin
2018-11-07 11:08 ` Johannes Schindelin
2018-11-07 12:22 ` [PATCH v3 0/2] range-diff: doc + regression fix Ævar Arnfjörð Bjarmason
2018-11-07 12:22 ` [PATCH v3 1/2] range-diff doc: add a section about output stability Ævar Arnfjörð Bjarmason
2018-11-07 13:10 ` Stephen & Linda Smith
2018-11-07 22:52 ` Junio C Hamano
2018-11-07 19:06 ` Martin Ågren
2018-11-07 12:22 ` [PATCH v3 2/2] range-diff: fix regression in passing along diff options Ævar Arnfjörð Bjarmason
2018-11-08 17:08 ` Eric Sunshine
2018-11-08 22:34 ` Ævar Arnfjörð Bjarmason
2018-11-09 6:46 ` Eric Sunshine
2018-11-09 7:36 ` Ævar Arnfjörð Bjarmason
2018-11-09 10:18 ` [PATCH v4 0/3] range-diff fixes Ævar Arnfjörð Bjarmason
2018-11-09 16:32 ` Johannes Schindelin
2018-11-09 10:18 ` [PATCH v4 1/3] range-diff doc: add a section about output stability Ævar Arnfjörð Bjarmason
2018-11-09 10:18 ` [PATCH v4 2/3] range-diff: fix regression in passing along diff options Ævar Arnfjörð Bjarmason
2018-11-09 10:18 ` [PATCH v4 3/3] range-diff: make diff option behavior (e.g. --stat) consistent Ævar Arnfjörð Bjarmason
2018-11-09 13:25 ` Stephen & Linda Smith
2018-11-11 8:43 ` Eric Sunshine
2018-11-12 3:17 ` Junio C Hamano
2018-11-12 3:32 ` Junio C Hamano
2018-11-13 18:55 ` [PATCH v5 0/3] range-diff fixes Ævar Arnfjörð Bjarmason
2018-11-14 15:36 ` Johannes Schindelin [this message]
2018-11-13 18:55 ` [PATCH v5 1/3] range-diff doc: add a section about output stability Ævar Arnfjörð Bjarmason
2018-11-13 18:55 ` [PATCH v5 2/3] range-diff: fix regression in passing along diff options Ævar Arnfjörð Bjarmason
2018-11-13 18:55 ` [PATCH v5 3/3] range-diff: make diff option behavior (e.g. --stat) consistent Ævar Arnfjörð Bjarmason
2018-11-06 4:16 ` [PATCH] range-diff: add a --no-patch option to show a summary Junio C Hamano
2018-11-06 5:15 ` Eric Sunshine
2018-11-06 5:57 ` Junio C Hamano
2018-11-06 8:36 ` Ævar Arnfjörð Bjarmason
2018-11-06 16:24 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2018-11-07 0:57 ` Junio C Hamano
2018-11-07 11:11 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1811141636350.39@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ischis2@cox.net \
--cc=lucas.demarchi@intel.com \
--cc=martin.agren@gmail.com \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).