From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Johannes Schindelin" <johannes.schindelin@gmx.de>,
git@vger.kernel.org, "Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH v2 0/4] cat-file: optionally convert to worktree version
Date: Wed, 24 Aug 2016 13:32:48 -0400 [thread overview]
Message-ID: <20160824173248.ami3hgadea5zjvf3@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr39eqevk.fsf@gitster.mtv.corp.google.com>
On Wed, Aug 24, 2016 at 10:02:39AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Wed, Aug 24, 2016 at 09:09:06AM -0700, Junio C Hamano wrote:
> >
> >> > + if (!path)
> >> > + path = obj_context.path;
> >> > + else if (obj_context.mode == S_IFINVALID)
> >> > + obj_context.mode = 0100644;
> >> > +
> >> > buf = NULL;
> >> > switch (opt) {
> >> > case 't':
> >>
> >> The above two hunks make all the difference in the ease of reading
> >> the remainder of the function. Very good.
> >
> > Yeah, I agree. Though it took me a moment to figure out why we were
> > setting obj_context.mode but not obj_context.path; the reason is that
> > "mode" is convenient to use as local storage, but "path" is not, because
> > it is not a pointer but an array.
>
> Wait a minute. Why is it a cascaded if/elseif, not two independent
> if statements that gives a default value? In other words, wouldn't
> these two independent and orthogonal decisions?
>
> * When forced to use some path, we ignore obj_context.path
>
> * Whether we are forced to use a path or not, if we do not know the
> mode from the lookup context, we want to use the regular blob
> mode.
>
> So that part of the patch is wrong after all, I would have to say.
>
> if (!path)
> path = obj_context.path;
> if (obj_context.mode == S_IFINVALID)
> obj_context.mode = 0100644;
>
> or something like that, perhaps.
Oh, hrm, you are right. I assumed we wanted to force the mode when
--path was in effect, but that is not what the original does. If you
say:
--path=foo HEAD:bar
then we will take the mode for "bar", whatever it is (maybe a tree or
symlink). But if you say:
--path=foo $(git rev-parse HEAD:bar)
then we will use 100644, regardless of what "bar" is in HEAD.
I have not thought about it enough to know if that is a good thing or a
bad thing. But I'll bet Dscho has, so I will wait for him to comment. :)
> > if (!force_path) {
> > /* use file info from sha1 lookup */
> > path = obj_context.path;
> > mode = obj_context.mode;
> > } else {
> > /* use path requested by user, and assume it is a regular file */
> > path = force_path;
> > mode = 0100644;
> > }
>
> Hmph, if you read it that way, then if/elseif makes some sense, but
> we need to assume that the obj_context.mode can be garbage and have
> a fallback for it.
>
> Just like
>
> git cat-file --filters --path=git.c HEAD:t
>
> would error out because HEAD:t is not even a blob, I would expect
>
> git cat-file --filters --path=git.c :RelNotes
>
> to error out, because the object itself _is_ known to be a
> blob that is not a regular file.
>
> And that kind of type checking will not be possible with "if the
> user gave us a path, assume it is a regular file".
Right, I agree that is the outcome, but I just wasn't sure that the
second case _should_ error out. IOW, does "--filters --path" mean "treat
this as a regular file at path X", or is the "regular file" part not
implied?
I don't suppose anybody cares that much either way, but it feels weird
to behave differently depending on how we looked up the blob (whereas
for the HEAD:t case, a tree is always a tree).
-Peff
next prev parent reply other threads:[~2016-08-24 17:32 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 12:46 [PATCH 0/4] cat-file: optionally convert to worktree version Johannes Schindelin
2016-08-18 12:46 ` [PATCH 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-08-18 16:21 ` Junio C Hamano
2016-08-18 12:46 ` [PATCH 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-08-18 15:49 ` Torsten Bögershausen
2016-08-19 12:37 ` Johannes Schindelin
2016-08-19 16:06 ` Junio C Hamano
2016-08-18 16:37 ` Junio C Hamano
2016-08-19 12:49 ` Johannes Schindelin
2016-08-19 8:57 ` Torsten Bögershausen
2016-08-19 15:00 ` Johannes Schindelin
2016-08-19 16:06 ` Junio C Hamano
2016-08-22 16:51 ` Torsten Bögershausen
2016-08-24 8:00 ` Johannes Schindelin
2016-08-18 12:46 ` [PATCH 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-08-18 16:52 ` Junio C Hamano
2016-08-19 14:49 ` Johannes Schindelin
2016-08-19 16:11 ` Junio C Hamano
2016-08-24 7:57 ` Johannes Schindelin
2016-08-18 12:46 ` [PATCH 4/4] cat-file: support --textconv/--filters in batch mode Johannes Schindelin
2016-08-18 15:42 ` Torsten Bögershausen
2016-08-19 12:25 ` Johannes Schindelin
2016-08-19 15:06 ` Jeff King
2016-08-19 16:19 ` Junio C Hamano
2016-08-18 17:08 ` Junio C Hamano
2016-08-19 12:59 ` Johannes Schindelin
2016-08-19 14:44 ` Jeff King
2016-08-18 22:05 ` Jeff King
2016-08-18 22:47 ` Junio C Hamano
2016-08-19 13:11 ` Johannes Schindelin
2016-08-19 13:09 ` Johannes Schindelin
2016-08-19 13:22 ` Jeff King
2016-08-24 12:23 ` [PATCH v2 0/4] cat-file: optionally convert to worktree version Johannes Schindelin
2016-08-24 12:23 ` [PATCH v2 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-08-24 12:23 ` [PATCH v2 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-08-24 17:46 ` Junio C Hamano
2016-08-24 17:52 ` Junio C Hamano
2016-08-31 20:31 ` Johannes Schindelin
2016-08-31 20:53 ` Junio C Hamano
2016-08-24 12:23 ` [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-08-24 17:49 ` Junio C Hamano
2016-08-24 18:25 ` Junio C Hamano
2016-08-31 19:49 ` Johannes Schindelin
2016-08-31 20:17 ` Junio C Hamano
2016-08-24 12:23 ` [PATCH v2 4/4] cat-file: support --textconv/--filters in batch mode Johannes Schindelin
2016-08-24 16:09 ` [PATCH v2 0/4] cat-file: optionally convert to worktree version Junio C Hamano
2016-08-24 16:19 ` Jeff King
2016-08-24 17:02 ` Junio C Hamano
2016-08-24 17:32 ` Jeff King [this message]
2016-08-24 17:55 ` Junio C Hamano
2016-08-29 21:02 ` Junio C Hamano
2016-08-31 20:34 ` Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 " Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 1/4] cat-file: fix a grammo in the man page Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 2/4] cat-file: introduce the --filters option Johannes Schindelin
2016-09-09 15:09 ` Junio C Hamano
2016-09-09 16:01 ` Johannes Schindelin
2016-09-09 16:08 ` Junio C Hamano
2016-09-09 17:16 ` Junio C Hamano
2016-09-09 17:26 ` Junio C Hamano
2016-09-10 7:57 ` Johannes Schindelin
2016-09-11 21:44 ` Junio C Hamano
2016-09-09 10:10 ` [PATCH v3 3/4] cat-file --textconv/--filters: allow specifying the path separately Johannes Schindelin
2016-09-09 18:06 ` Junio C Hamano
2016-09-10 7:59 ` Johannes Schindelin
2016-09-09 10:10 ` [PATCH v3 4/4] cat-file: support --textconv/--filters in batch mode 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=20160824173248.ami3hgadea5zjvf3@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=tboegi@web.de \
/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).