From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: js/difftool-no-index, was Re: What's cooking in git.git (May 2019, #02; Tue, 14)
Date: Wed, 15 May 2019 10:24:40 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905151015540.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqef508q0y.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 15 May 2019, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Tue, 14 May 2019, Junio C Hamano wrote:
> >
> >> * js/difftool-no-index (2019-05-09) 1 commit
> >> - difftool --no-index: error out on --dir-diff (and don't crash)
> >>
> >> The "--dir-diff" mode of "git difftool" is not useful in "--no-index"
> >> mode; they are now explicitly marked as mutually incompatible.
> >>
> >> Will merge to 'next'.
> >
> > Seeing as the following is a part of v2.22.0-rc0's release notes:
> >
> > * "git difftool" can now run outside a repository.
> >
> > maybe we could get this to `master` instead of `next`?
>
> There is no 'instead of'. Topics advance one step at a time.
Well, some topics seem to enter `next` via `master`...
> I do not recall seeing you respond to my review comments on the
> "error out" patch <xmqqv9ykdr1w.fsf@gitster-ct.c.googlers.com>, but
> thinking about it further, assuming that my rephrasing of your
> justification in my review was correct, I wonder if it is even more
> correct if we do not error out but simply behave as if "--dir-diff"
> option were not given.
I misunderstood that to be a rhetoric question, like in the "thinking out
loud" you favor. Sorry.
> That is, if there were some way to distinguish tracked and untracked
> paths in --no-index mode, --dir-diff would copy only the tracked parts
> to temporary directories and run tree comparison. Since there is no
> "untracked paths" by definition in --no-index mode, we do not even
> have to make copies but just compare the two directories given using
> the same tree comparison tool.
As far as `--no-index` is concerned, all files are untracked anyway. There
is no index, so there are no staged/committed/tracked files.
> Wouldn't that be more useful behaviour than telling the end users to
> run the backend tree comparison tool themselves?
I am lost. What behavior are you talking about? I *think* you mean to say
that the `--dir-diff` mode under `--no-index` should essentially do what
`--no-dir-diff` does? I think that's not the way I want to go. The
`--dir-diff` mode only makes sense when there is a mix of
tracked/untracked files, which simply is not the case for `--no-index`.
And we should not make it "fall back" to its opposite. The user asked for
`--dir-diff` and it just does not make sense.
In any case, the patch series I'd like to see advanced to `master` is not
about supporting or not supporting `--dir-diff` with `--no-index`, but
about preventing a segmentation fault when a user calls the (non-sense)
combination of `--no-index` and `--dir-diff`.
Ciao,
Dscho
next prev parent reply other threads:[~2019-05-15 8:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 16:11 What's cooking in git.git (May 2019, #02; Tue, 14) Junio C Hamano
2019-05-13 22:20 ` Elijah Newren
2019-05-14 9:54 ` js/difftool-no-index, was " Johannes Schindelin
2019-05-15 1:28 ` Junio C Hamano
2019-05-15 8:24 ` Johannes Schindelin [this message]
2019-05-15 8:50 ` Junio C Hamano
2019-05-17 18:27 ` Johannes Schindelin
2019-05-19 1:44 ` Junio C Hamano
2019-05-21 22:28 ` 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.1905151015540.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).