| Message ID | 20181113185558.23438-1-avarab@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | range-diff fixes | expand |
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 > >
Trivial updates since v4 addressing the feedback on that iteration. Hopefully this is the last one, range-diff with the last version: 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(-)