Re: git diff: support "-U" and "--unified" options properly

From: Junio C Hamano <junkio@cox.net>
Date: May 13, 2006, 21:22 UTC
Message-ID: <7vpsihsjq6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0605131404391.3866@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

Show 14 quoted lines

> On Sat, 13 May 2006, Junio C Hamano wrote:
>>
>> Linus Torvalds <torvalds@osdl.org> writes:
>> 
>> > [ Maybe this can still hit 1.3.3? ]
>> 
>> Ah, we did not pass the diffopt to the function builtin_diff() in
>> 1.3.X series, so not really.
>
> Ahh, ok. Never mind. It's not like people have been clamoring for it, it 
> just seemed to be such a _silly_ thing.
>
> Might as well just go into the curren development tree, and then we'll 
> have it fixed eventually (1.4.0?)

No question about that part. I've been meaning to start drawing the line of what to have in 1.4 and what to leave out, but the last week was shot so I haven't got around to.

A rough outline.

I'd like to have the following topics from "next":

 * cvsserver and cvsexportcommit updates (ml/cvs)

   Ready.

 * config syntax (lt/config)

   Ready.

 * built-in grep (jc/grep)

   Ready.

 * built-in format-patch (js/fmt-patch)

   Some features are still missing compared to the script
   version.

 * remotes/ information from .git/config (js/fetchconfig)

   This by itself is more or less ready, but I would like to
   further adjust it to the "per branch configuration"
   discussion before pushing it out.

   I'd like to eventually arrange things like this.

   [branch "master"]
	remote = "ko-private"
	; prevent "reset --hard" from rewinding past this.
        rewind-barrier = refs/heads/ko-master

   ; my private build areas on the kernel.org machines
   [remote "ko-private"]
   	url = "x86-64-build.kernel.org:git"
   	url = "i386-build.kernel.org:git"
        push = master:origin
        push = next:next
        push = +pu:pu
        push = maint:maint

   ; for publishing and keeping track of what I pushed there last time
   [remote "ko"]
   	url = "kernel.org:/pub/scm/git/git.git"
        push = master:master
        push = next:next
        push = +pu:pu
        push = maint:maint
	fetch = master:ko-master
	fetch = next:ko-next
        fetch = +pu:ko-pu
        fetch = maint:ko-maint