From: Thomas Gummerer <t.gummerer@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Duy Nguyen <pclouds@gmail.com>, git@vger.kernel.org
Subject: Re: incorrect range-diff output?
Date: Sun, 14 Apr 2019 22:12:14 +0100 [thread overview]
Message-ID: <20190414211214.GH32487@hank.intra.tgummerer.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1904121038540.41@tvgsbejvaqbjf.bet>
On 04/12, Johannes Schindelin wrote:
> Hi Thomas,
>
> On Thu, 11 Apr 2019, Thomas Gummerer wrote:
>
> > On 04/11, Duy Nguyen wrote:
> > > Try
> > >
> > > git range-diff from...to
> > >
> > > with those two branches from https://gitlab.com/pclouds/git.git. The
> > > interesting part is this
> > >
> > > diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
> > > --- a/Documentation/gitcli.txt
> > > @@ -120,10 +111,11 @@
> > > * linkgit:git-commit[1] to advance the current branch.
> > >
> > > - * linkgit:git-reset[1] and linkgit:git-checkout[1] (with
> > > -+ * linkgit:git-reset[1] and linkgit:git-restore[1] (with
> > > - pathname parameters) to undo changes.
> > > +- pathname parameters) to undo changes.
> > > ++ * linkgit:git-restore[1] to undo changes.
> > >
> > > * linkgit:git-merge[1] to merge between local branches.
> > > +
> > >
> > > This particular hunk comes from giteveryday.txt, not gitcli.txt. And
> > > the b/Documentation/gitcli.txt line is also missing.
> >
> > I think the output here is technically correct, even though it is very
> > misleading. range-diff doesn't currently show the filenames of the
> > diff that changed, which makes this a bit hard to read.
>
> True. In the spirit of the "funcname" feature of our `git diff` command,
> we could add some (abbreviated) form of the corresponding `diff` lines
> (maybe just the `a/` filename? Or maybe the `a/` file name, prefixed by
> `-` or `+`, and if the `b/` filename is different, `old->new`? With
> `/dev/null` substituted by `(new)` or `(deleted)`?).
Yeah something like this is what I ended up doing. Except I was a bit
more verbose, so the filename would be prefixed with "modified file",
"new file", "deleted file" or "renamed file". Since this doesn't need
to be machine readable in any way, I felt like that might be easiest
to consume for humans.
next prev parent reply other threads:[~2019-04-14 21:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 11:17 incorrect range-diff output? Duy Nguyen
2019-04-11 22:05 ` Thomas Gummerer
2019-04-12 8:41 ` Johannes Schindelin
2019-04-14 21:12 ` Thomas Gummerer [this message]
2019-04-12 9:21 ` Duy Nguyen
2019-04-12 15:02 ` Junio C Hamano
2019-04-14 21:20 ` Thomas Gummerer
2019-04-15 2:01 ` Junio C Hamano
2019-04-15 12:40 ` Johannes Schindelin
2019-04-14 21:09 ` [RFC PATCH 0/4] output improvements for git range-diff Thomas Gummerer
2019-04-14 21:09 ` [RFC PATCH 1/4] range-diff: fix function parameter indentation Thomas Gummerer
2019-04-14 21:09 ` [RFC PATCH 2/4] range-diff: don't remove funcname from inner diff Thomas Gummerer
2019-04-14 23:21 ` Eric Sunshine
2019-04-15 12:54 ` Johannes Schindelin
2019-04-15 18:56 ` Thomas Gummerer
2019-04-17 11:52 ` Johannes Schindelin
2019-04-24 18:15 ` Thomas Gummerer
2019-04-15 12:53 ` Johannes Schindelin
2019-04-15 18:57 ` Thomas Gummerer
2019-04-14 21:09 ` [RFC PATCH 3/4] range-diff: add section header instead of diff header Thomas Gummerer
2019-04-14 23:29 ` Eric Sunshine
2019-04-15 6:28 ` Johannes Sixt
2019-04-15 13:01 ` Johannes Schindelin
2019-04-15 19:09 ` Thomas Gummerer
2019-04-14 21:09 ` [RFC PATCH 4/4] range-diff: add section headers to the outer hunk header Thomas Gummerer
2019-04-15 12:44 ` Johannes Schindelin
2019-04-15 18:48 ` Thomas Gummerer
2019-04-15 12:47 ` [RFC PATCH 0/4] output improvements for git range-diff Johannes Schindelin
2019-04-15 19:25 ` Thomas Gummerer
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=20190414211214.GH32487@hank.intra.tgummerer.com \
--to=t.gummerer@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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).