From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jack Bates <bk874k@nottheoilrig.com>,
git@vger.kernel.org, Jack Bates <jack@nottheoilrig.com>
Subject: Re: [PATCH] diff: fix up SHA-1 abbreviations outside of repository
Date: Mon, 5 Dec 2016 02:26:14 -0500 [thread overview]
Message-ID: <20161205072614.zg6yglqnznna65vf@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr35m6dwt.fsf@gitster.mtv.corp.google.com>
On Sun, Dec 04, 2016 at 11:19:46PM -0800, Junio C Hamano wrote:
> > - if (no_index)
> > + if (no_index) {
> > /* If this is a no-index diff, just run it and exit there. */
> > + startup_info->have_repository = 0;
> > diff_no_index(&rev, argc, argv);
> > + }
>
> This kind of change makes me nervous (partly because I am not seeing
> the whole code but only this part of the patch).
>
> Some code may react to "have_repository" being zero and do the right
> thing (which I think is what you are using from your previous "we
> did one of the three cases" change here), but the codepath that led
> to "have_repository" being set to non-zero previously must have done
> a lot more than just flipping that field to non-zero, and setting
> zero to this field alone would not "undo" what it did.
I _think_ it's OK because the only substantive change would be the
chdir() to the top of the working tree. But that information is carried
through by revs->prefix, which we act on regardless of the value of
startup_info->have_repository when we call prefix_filename().
I agree that it may be an accident waiting to happen, though, as soon as
some buried sub-function needs to care about the distinction.
> I wonder if we're better off if we made sure that diff_no_index()
> works the same way regardless of the value of "have_repository"
> field?
If you mean adding a diffopt flag like "just abbreviate everything to
FALLBACK_DEFAULT_ABBREV even if we're in a repository", and then setting
that in diff_no_index(), I agree that is a lot cleaner.
I'm still not 100% convinced that it's actually the correct behavior,
but at least doing a more contained version wouldn't take away other
functionality like reading config.
-Peff
next prev parent reply other threads:[~2016-12-05 7:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-04 19:47 [PATCH] diff: fix up SHA-1 abbreviations outside of repository Jack Bates
2016-12-05 6:55 ` Jeff King
2016-12-05 7:19 ` Junio C Hamano
2016-12-05 7:26 ` Jeff King [this message]
2016-12-05 17:45 ` Jack Bates
2016-12-05 22:43 ` 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=20161205072614.zg6yglqnznna65vf@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bk874k@nottheoilrig.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jack@nottheoilrig.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).