From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Documentation/git-diff: remove -r from --name-status example
Date: Sun, 29 Jul 2007 12:14:49 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707291214060.14781@racer.site> (raw)
In-Reply-To: <20070729094955.GA14915@coredump.intra.peff.net>
Hi,
On Sun, 29 Jul 2007, Jeff King wrote:
> -- >8 --
> git-diff: turn on recursion by default
>
> The tree recursion behavior of git-diff may appear
> inconsistent to the user because it depends on the format of
> the patch as well as whether one is diffing between trees or
> against the index.
>
> Since git-diff is a porcelain wrapper for low-level diff
> commands, it makes sense for its behavior to be consistent
> no matter what is being diffed. This patch turns on
> recursion in all cases.
>
> diff --git a/builtin-diff.c b/builtin-diff.c
> index 7f367b6..b48121e 100644
> --- a/builtin-diff.c
> +++ b/builtin-diff.c
> @@ -233,6 +233,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
> die("diff_setup_done failed");
> }
> rev.diffopt.allow_external = 1;
> + rev.diffopt.recursive = 1;
How about
if (!rev.diffopt.quiet)
rev.diffopt.recursive = 1;
instead?
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-29 11:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-29 0:24 [PATCH] Documentation/git-diff: remove -r from --name-status example Jeff King
2007-07-29 2:06 ` Linus Torvalds
2007-07-29 4:11 ` Jeff King
2007-07-29 4:27 ` Linus Torvalds
2007-07-29 4:48 ` Junio C Hamano
2007-07-29 4:56 ` Jeff King
2007-07-29 8:23 ` David Kastrup
2007-07-29 9:36 ` Junio C Hamano
2007-07-29 9:49 ` Jeff King
2007-07-29 11:14 ` Johannes Schindelin [this message]
2007-07-29 11:33 ` David Kastrup
2007-07-29 11:38 ` Jeff King
2007-07-29 12:04 ` Johannes Schindelin
2007-07-29 12:19 ` Jeff King
2007-07-29 12:24 ` Johannes Schindelin
2007-07-29 12:26 ` Jeff King
2007-07-29 16:51 ` Linus Torvalds
2007-07-29 4:52 ` Jeff King
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=Pine.LNX.4.64.0707291214060.14781@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
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).