Re: [PATCH] Documentation/git-diff: remove -r from --name-status example

From: Jeff King <peff@peff.net>
Date: Jul 29, 2007, 04:56 UTC
Message-ID: <20070729045646.GB6858@coredump.intra.peff.net>
In-Reply-To: <7vbqdvolww.fsf@assigned-by-dhcp.cox.net>

On Sat, Jul 28, 2007 at 09:48:15PM -0700, Junio C Hamano wrote:

> However, I think Jeff's patch always makes it recursive even
> when the user asks for --raw, which makes it inappropriate for
> inclusion whether before or after 1.5.3.

Right, that's the point. git-diff is currently inconsistent (unless you understand that index comparisons are always recursed, and tree comparisons need it explicitly -- but part of the point of git-diff is to abstract those sorts of details), so this attempts to harmonize the behavior no matter what you're diffing (whether it be --name-status or --raw).

If you really want not to recurse, then you have to know you are comparing trees anyway, at which point it makes sense to use the git-diff-tree plumbing.

-Peff