Re: [PATCH 2/4] Tweak diff output further to make it a bit less distracting.

From: Junio C Hamano <junkio@cox.net>
Date: May 16, 2005, 22:51 UTC
Message-ID: <7vsm0mn5s1.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050516220559.GC8609@pasky.ji.cz>

>>>>> "PB" == Petr Baudis <pasky@ucw.cz> writes:

PB> What about just throwing away the newlines and just passing '@.'?

Let's just drop the patch altogether unless anybody else has better justification and pressing needs.

The current one is tolerable, except I do not like the word "mode" very much.

    --- a/frotz
    +++ b/frotz
    @@ xxx @@
    + asdfasdf
    # mode: 100644 100755 nitfol
    --- a/nitfol
    +++ b/nitfol
    @@ yyy @@
    - asdfasdf
    + asdfasdfasdf
    --- a/rezrov
    +++ b/rezrov
    @@ zzz @@
     ...

This is what we would have got with the patch, which as you say gives an illusion as if there should exist an empty line in "frotz" and "nitfol", after the lines the hunks are applied to. I should not have pushed it to begin with.

    --- a/frotz
    +++ b/frotz
    @@ xxx @@
    + asdfasdf

    @. 100644 100755 nitfol
    --- a/nitfol
    +++ b/nitfol
    @@ yyy @@
    - asdfasdf
    + asdfasdfasdf

    --- a/rezrov
    +++ b/rezrov
    @@ zzz @@
     ...