From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] tree_entry_interesting: make recursive mode default
Date: Wed, 11 Jan 2012 21:04:59 -0800 [thread overview]
Message-ID: <7v1ur54ikk.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1326341371-16628-1-git-send-email-pclouds@gmail.com> (=?utf-8?B?Ik5ndXnhu4VuCVRow6FpIE5n4buNYw==?= Duy"'s message of "Thu, 12 Jan 2012 11:09:31 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> There is a bit of history behind this. Some time ago, t_e_i() only
> supported prefix matching. diff-tree supported recursive and
> non-recursive mode but it did not make any difference to prefix
> matching.
>
> Later on, t_e_i() gained limited recursion support to unify a similar
> matching code used by git-grep. It introduced two new fields in struct
> pathspec: max_depth and recursive. "recursive" field functions as a
> feature switch so that this feature is off by default.
>
> Some time after that, t_e_i() further gained wildcard support. With
> wildcard matching, recursive and non-recursive diff-tree
> mattered. "recursive" field was reused to distinguish recursion in
> diff-tree.
>
> This choice has a side effect that by default wildcard matching is in
> non-recursive mode, which is not true. All current call sites except
> "diff-tree without -r" (grep, traverse_commit_list, tree-walk and
> general tree diff) prefer recursive mode.
>
> This patch decouples the use of recursive field. The max_depth feature
> switch is now controlled by max_depth_valid field. diff-tree recursion
> is controlled by nonrecursive_diff_tree, which makes it recursive by
> default.
Thanks, but I am curious about two (and a half) things.
- The "max_depth" option has perfectly good and natural "invalid"
sentinel values (i.e. 0 or negative). Why do we need a separate
bitfield?
- Special casing the non-recursive mode of diff-tree is perfectly
acceptable, but nonrecursive_diff_tree does not sound like a very good
name for it for two reasons. Perhaps there may be other users that want
the "surface only" behaviour, so having "diff_tree" in the name limits
its future (re)use. Also an option that is named negatively inevitably
invites "if (!opt->non_whatever)" double negative. Can we come up with
a better name, perhaps "onelevel_only" or something?
- Shouldn't "onelevel_only" be the same as limiting to a single depth
with "max_depth"?
next prev parent reply other threads:[~2012-01-12 5:05 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-23 7:25 What's the difference between `git show branch:file | diff -u - file` vs `git diff branch file`? Marat Radchenko
2011-08-23 10:03 ` Michael J Gruber
2011-08-23 10:52 ` Marat Radchenko
2011-08-23 15:20 ` Michael Witten
2011-08-23 15:34 ` Michael J Gruber
2011-08-23 16:45 ` Marat Radchenko
2011-08-23 17:15 ` Junio C Hamano
2011-08-23 18:21 ` Marat Radchenko
2011-08-23 20:07 ` Michael J Gruber
2011-08-25 16:09 ` Marat Radchenko
2011-08-25 21:10 ` Junio C Hamano
2011-08-26 9:43 ` Marat Radchenko
2011-08-29 7:41 ` Nguyen Thai Ngoc Duy
2011-08-29 14:48 ` Marat Radchenko
2011-08-29 16:09 ` Nguyen Thai Ngoc Duy
2011-08-29 17:18 ` Junio C Hamano
2011-08-29 20:42 ` Junio C Hamano
2011-08-29 20:50 ` Junio C Hamano
2011-08-29 21:09 ` Junio C Hamano
2011-08-29 21:33 ` [PATCH 0/3] Un-pessimize "diff-index $commit -- $pathspec" Junio C Hamano
2011-08-29 21:33 ` [PATCH 1/3] traverse_trees(): allow pruning with pathspec Junio C Hamano
2011-08-30 12:53 ` Nguyen Thai Ngoc Duy
2011-08-30 17:44 ` Junio C Hamano
2011-08-31 1:35 ` Nguyen Thai Ngoc Duy
2011-10-09 15:39 ` Michael Haggerty
2011-10-09 21:35 ` Nguyen Thai Ngoc Duy
2011-10-10 4:42 ` Michael Haggerty
2011-08-29 21:33 ` [PATCH 2/3] unpack-trees: " Junio C Hamano
2011-08-30 13:03 ` Nguyen Thai Ngoc Duy
2011-08-30 17:32 ` Junio C Hamano
2011-08-30 15:24 ` David Michael Barr
2011-08-29 21:33 ` [PATCH 3/3] diff-index: pass pathspec down to unpack-trees machinery Junio C Hamano
2012-01-11 6:31 ` Jonathan Nieder
2012-01-11 8:05 ` Junio C Hamano
2012-01-11 12:33 ` Nguyen Thai Ngoc Duy
2012-01-11 12:47 ` Nguyen Thai Ngoc Duy
2012-01-11 20:40 ` Junio C Hamano
2012-01-12 4:09 ` [PATCH] tree_entry_interesting: make recursive mode default Nguyễn Thái Ngọc Duy
2012-01-12 5:04 ` Junio C Hamano [this message]
2012-01-12 5:44 ` Nguyen Thai Ngoc Duy
2012-01-14 9:23 ` [PATCH v2 1/2] Document limited recursion pathspec matching with wildcards Nguyễn Thái Ngọc Duy
2012-01-14 9:23 ` [PATCH v2 2/2] tree_entry_interesting: make recursive mode default Nguyễn Thái Ngọc Duy
2012-01-15 3:12 ` Junio C Hamano
2012-01-15 10:03 ` Nguyen Thai Ngoc Duy
2012-01-16 22:15 ` Junio C Hamano
2012-01-18 8:59 ` Nguyen Thai Ngoc Duy
2012-01-15 2:38 ` [PATCH v2 1/2] Document limited recursion pathspec matching with wildcards Junio C Hamano
2012-01-15 9:48 ` Nguyen Thai Ngoc Duy
2011-08-29 21:56 ` [PATCH 0/3] Un-pessimize "diff-index $commit -- $pathspec" Linus Torvalds
2011-08-29 22:05 ` Junio C Hamano
2011-08-29 22:11 ` Linus Torvalds
2011-08-29 23:42 ` Junio C Hamano
2011-08-30 6:16 ` Marat Radchenko
2011-08-31 0:18 ` Junio C Hamano
2011-08-30 10:04 ` Michael J Gruber
2011-08-30 17:03 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1ur54ikk.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=torvalds@linux-foundation.org \
/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.
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 NNTP newsgroup(s).