Quick status updates

From: Junio C Hamano <junkio@cox.net>
Date: Feb 6, 2007, 07:40 UTC
Message-ID: <7v3b5jka3t.fsf_-_@assigned-by-dhcp.cox.net>
In-Reply-To: <7vps8qtgbm.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

Show 8 quoted lines

> Several things to note (in the following, substitute $gmane with
> http://article.gmane.org/gmane.comp.version-control.git):
>
>  - Working around Tk geometry problem, especially on non Linux+X
>    platforms.  I've forwarded Mark Levedahl's patches
>    ($gmane/38361) to Paul Mackerras for his blessing; hopefully
>    he can Ack and/or suggest improvements.  I'd really like to
>    have them in 1.5.0 in some form.

Mark and I got a response from Paul; unfortunately he is too busy right now, immediately after post 2.6.20 merge window has opened. I've parked Mark's patches and another one suggested by Linus in response to Johannes Sixt's MinGW work in 'next' for now. Depending on Paul's availablity, I might end up applying them in my tree first.

Show 6 quoted lines

>  - Nico's "reflog on HEAD".
>  - Reverting the patch to allow tracking branch names as the
>    value of branch.*.merge ($gmane/38621).
>  - Teaching "git blame" to also use the working tree files
>    and/or index.
>  - "git remote add -t -f -m" ($gmane/38470).

These four are in ("git clone" rewrite is not).

>  - We might want to allow git-push to use the wildcard refspec,
>    like git-fetch does, for symmetry.

I've done this which was not too painful -- a patch in a separate message to follow.

I also applied a handful patches from early this year that was left unapplied. After reviewing the message I am responding to, and an earlier "a few remaining issues..." ($gmane/35993), I think I am pretty much done with 1.5.0 preparation.

After pulling gfi from Shawn and applying the outstanding gitk patches (either via Paul or myself), I'll tag -rc4 and give it a week or so before the final.

I should remember to remove git-merge-recur before -rc4 ;-).