Re: [PATCH] git push: Interpret $GIT_DIR/branches in a Cogito compatible way

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 11, 2008, 17:25 UTC
Message-ID: <7vod0m18fb.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20081111083704.GA4075@auto.tuwien.ac.at>

mkoegler@auto.tuwien.ac.at (Martin Koegler) writes:

Show 23 quoted lines

> Nobody else seemd to be interessted in this topic, so its difficult to
> start a discussion.
>
> I would suggest to queue it in pu for some time and wait for other
> feedback.
>
>> While I'd personally agree matching with whatever cg-push used to do might
>> make the most sense in the end, I am not sure changing of behaviour
>> abruptly like this is a good idea.
>
> I'm open for any suggestion, how to make this change smoothly. I
> think, that doing such a behaviour change should be OK for 1.6.1 or
> 1.6.2:
>
> Until v1.5.4 (9 month ago), git-push with # was totally broken. Daniel
> Barkalow fixed the fetch case in v1.5.4. As a side effect, git-push no
> longer fails, but ignores everything after #. So in my option, the
> current behaviour was created by chance.
>
>> I am also not so sure url#branch is illogical; I'd suggest dropping that
>> line from the commit log message in any case.
>
> OK, I'll drop it in the next version.

Thanks for detailed explanation of the background.

Everything you said makes sense. You convinced me that this is just a bugfix that does not warrant a deprecation notice nor waiting for a flag day release. I'm even inclined to say that we should apply this eventually to 'maint' (which means we'd fork a topic branch from maint, merge that first to next and then to master and eventually to maint to be included in 1.6.0.X, while the change will go to 1.6.1 as well).

Does the patch apply to 'maint' right now?