From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Philip Oakley <philipoakley@iee.org>,
Elijah Newren <newren@gmail.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
vincent.guittot@linaro.org
Subject: Re: Deprecating git diff ..; dealing with other ranges
Date: Mon, 11 Mar 2019 14:19:21 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1903111412280.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190311093751.GA31092@archbookpro.localdomain>
Hi Denton,
On Mon, 11 Mar 2019, Denton Liu wrote:
> I was in the process of deprecating `git diff <commit>..<commit>` as
> discussed here[1]. However, I ran into a weird case that I'm not sure
> how to deal with.
>
> In t3430-rebase-merges.sh:382, we have the following test case which
> invokes git diff:
>
> test_expect_success 'with --autosquash and --exec' '
> git checkout -b with-exec H &&
> echo Booh >B.t &&
> test_tick &&
> git commit --fixup B B.t &&
> write_script show.sh <<-\EOF &&
> subject="$(git show -s --format=%s HEAD)"
> => content="$(git diff HEAD^! | tail -n 1)"
> echo "$subject: $content"
> EOF
> test_tick &&
> git rebase -ir --autosquash --exec ./show.sh A >actual &&
> grep "B: +Booh" actual &&
> grep "E: +Booh" actual &&
> grep "G: +G" actual
> '
>
> It gets caught in my attempt to only deprecate ..'s. Technically, it's
> undocumented behaviour and it only happens to work because git-diff
> accept ranges but it doesn't operate in an intuitive way.
I beg to differ. `git diff <commit>^!` does exactly what I want: it shows
the diff between the commit's first parent and the commit.
And I would not necessarily call this a "range". It is a short-hand. Can't
you allow short-hands in `git diff`, and disallow only ranges that have an
explicit `..` in them? You might need to record that somewhere, but I
think that should be easy enough.
Ciao,
Johannes
>
> I was just wondering what we should do about this case? Should we
> deprecate all invocations of `git diff <range>` except for the special
> case of `git diff <commit>...<commit>`, or should we _only_ deprecate
> `git diff <commit>..<commit>` and allow all other forms of ranges, even
> though it was undocumented behaviour?
>
> Thanks,
>
> Denton
>
> [1]: https://public-inbox.org/git/xmqqmumy6mxe.fsf@gitster-ct.c.googlers.com/
>
next prev parent reply other threads:[~2019-03-11 13:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 9:37 Deprecating git diff ..; dealing with other ranges Denton Liu
2019-03-11 13:19 ` Johannes Schindelin [this message]
2019-03-11 15:34 ` Elijah Newren
2019-03-12 7:17 ` Junio C Hamano
2019-03-12 17:24 ` Andreas Schwab
2019-03-12 21:01 ` Ævar Arnfjörð Bjarmason
2019-03-13 7:01 ` Johannes Sixt
2019-03-18 17:07 ` Elijah Newren
2019-03-18 17:11 ` Michal Suchánek
2019-03-18 18:51 ` Elijah Newren
2019-03-18 17:59 ` Ævar Arnfjörð Bjarmason
2019-03-13 1:20 ` Duy Nguyen
2019-03-13 18:12 ` Andreas Schwab
2019-03-12 7:22 ` 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
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.1903111412280.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=newren@gmail.com \
--cc=philipoakley@iee.org \
--cc=vincent.guittot@linaro.org \
--cc=viresh.kumar@linaro.org \
/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).