git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
	git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>,
	Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH v5 03/19] builtin/diff-tree: convert to struct object_id
Date: Wed, 22 Feb 2017 14:16:42 -0500	[thread overview]
Message-ID: <20170222191641.o2rtt2ymtb4h2yqe@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqy3wyawlu.fsf@gitster.mtv.corp.google.com>

On Wed, Feb 22, 2017 at 10:50:21AM -0800, Junio C Hamano wrote:

> "brian m. carlson" <sandals@crustytoothpaste.net> writes:
> 
> > Convert most leaf functions to struct object_id.  Change several
> > hardcoded numbers to uses of parse_oid_hex.  In doing so, verify that we
> > when we want two trees, we have exactly two trees.
> >
> > Finally, in stdin_diff_commit, avoid accessing the byte after the NUL.
> > This will be a NUL as well, since the first NUL was a newline we
> > overwrote.  However, with parse_oid_hex, we no longer need to increment
> > the pointer directly, and can simply increment it as part of our check
> > for the space character.
> 
> After reading the pre- and post-image twice, I think I convinced
> myself that this is a faithful conersion and they do the same thing.

I think this is correct, too (but then, I think it largely comes from
the patch I wrote the other night. So I did look at it carefully, but
it's not exactly an independent review).

> What the function does appears somewhat iffy in the modern world.
> We are relying on the fact that while Git is operating in this mode
> of reading a tuple of commits per line and doing log-tree, that Git
> itself will not do the history traversal (instead, another instance
> of Git that feeds us via our standard input is walking the history)
> for this piece of code to work correctly.  
> 
> Of course, the "diff-tree --stdin" command was meant to sit on the
> downstream of "rev-list --parents", so the assumption the code makes
> (i.e. the parents field of the in-core commit objects do not have to
> be usable for history traversal) may be reasonable, but still...

I'm not sure it's that weird. "diff-tree" is about diffing, not
traversal. The only reason it touches commit->parents at all (and
doesn't just kick off a diff between the arguments it gets) is that it's
been stuck with pretty-printing the commits, which might ask to show the
parents.

-Peff

  reply	other threads:[~2017-02-22 19:16 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-21 23:47 [PATCH v5 00/19] object_id part 6 brian m. carlson
2017-02-21 23:47 ` [PATCH v5 01/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-21 23:47 ` [PATCH v5 02/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 03/19] builtin/diff-tree: " brian m. carlson
2017-02-22 18:50   ` Junio C Hamano
2017-02-22 19:16     ` Jeff King [this message]
2017-02-22 20:04       ` Junio C Hamano
2017-02-22 23:22       ` brian m. carlson
2017-02-22 23:38         ` [PATCH] t: add multi-parent test of diff-tree --stdin brian m. carlson
2017-02-22 23:42           ` Junio C Hamano
2017-02-22 23:45             ` Jeff King
2017-02-22 23:45             ` brian m. carlson
2017-02-21 23:47 ` [PATCH v5 04/19] builtin/describe: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 05/19] builtin/fast-export: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 06/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 07/19] builtin/grep: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 08/19] builtin/branch: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 09/19] builtin/clone: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 10/19] builtin/merge: " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 11/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 12/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 13/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 14/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 15/19] refs: simplify parsing of reflog entries brian m. carlson
2017-02-21 23:47 ` [PATCH v5 16/19] sha1_file: introduce an nth_packed_object_oid function brian m. carlson
2017-02-21 23:47 ` [PATCH v5 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-21 23:47 ` [PATCH v5 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-21 23:47 ` [PATCH v5 19/19] wt-status: " brian m. carlson

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=20170222191641.o2rtt2ymtb4h2yqe@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sandals@crustytoothpaste.net \
    /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).