From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 04 Mar 2008 08:37:28 GMT
Subject: Re: [PATCH] Fix 'git remote show' regression on empty repository in 1.5.4
Message-ID: <7vd4qaanqv.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080304060036.GA17106@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

>  It will cause a merge conflict against `master` as there is a
>  change there to invoke transport_disconnect(transport) before
>  displaying the refs.
>
>  Since the disconnect patch is not in maint, but this is a current
>  regression in 1.5.4.3, I'm sending you a conflicting patch.  :)

That's perfectly fine.  Merging is what maintainers do.