On Mon, May 07, 2012 at 09:55:05PM -0700, Junio C Hamano wrote:
> All patches looked good. I thought that this deserved to eventually land
> on 'maint', so I did my usual "am first to master primarily to populate
> the object database with exact blob objects, then rebase the result to
> 'maint' while resolving conflicts both textual and semantic, and finally
> attempt to merge it back to 'master'" dance to come up with a two topic
> branches. The result is queued in 'pu'.
I eyeballed the result. It all looks good except for patch 2 (refactor
colopts handling), which now has a totally bogus commit message. Since
colopts came much later, the only thing left in the patch is the
movement of the local "struct wt_status s" in cmd_{commit,status} to a
static at the top of each function (so that it can be referenced
directly by the options list).
Probably that patch (94f98829) should just be squashed into its parent.
And then the colopts bits can be moved to the very end, after the rest
of it, and be a part of only the non-maint topic.
I've pushed that result out to the jk/{maint-,}status-porcelain-z-b
branches at git://github.com/peff/git.git if that helps.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html