Re: [PATCH 0/7] Rework diff options

From: Junio C Hamano <junkio@cox.net>
Date: Jun 25, 2006, 03:48 UTC
Message-ID: <7vslltopzg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060624201843.a5b4f7b9.tihirvon@gmail.com>

Timo Hirvonen <tihirvon@gmail.com> writes:

Show 7 quoted lines

> This patch series cleans up diff output format options.
>
> This makes it possible to use any combination of --raw, -p, --stat and
> --summary options and they work as you would expect.
>
> These patches passed all test and are for the next branch. Patches 6 and
> 7 are optional.

Thanks, very nicely done. Tentatively placed all of them in "pu"; the first "clean-up" is in "master".

Here are a few problems I have seen:

 - "git show --stat HEAD" gives '---' marker as Johannes and you
   have already discussed (I do not mind this that much though);

 - "--cc" seems to be quite broken.  "git show v1.0.0" nor "git
   diff-tree --pretty --cc v1.0.0" does not give the log
   message, and gives something quite confused instead.  I think
   it is showing "-m -p" followed by "--cc".

We may find more minor breakages, in addition to these, but I am reasonably sure we should be able to fix them in-tree.