On Wed, May 07, 2014 at 01:40:05PM -0700, Junio C Hamano wrote:
> Heiko Voigt <hvo...@hvoigt.net> writes:
> > On Mon, Apr 28, 2014 at 04:29:31PM +0200, Stepan Kasal wrote:
> >> this is another patch that lives in msysGit for a long time.
> >> Originally, it had two parts:
> >> (Cf https://github.com/msysgit/git/commit/64a8a03 )
> >> 1) adding alias pwd='pwd -W' to git-sh-setup.sh
> >> This one went upstream, though as a shell function.
> >> 2) revert of commit 4dce7d9b by Johannes Sixt <j...@kdbg.org>
> >> This mingw-specific commit was created less than 3 weeks before
> >> it was reverted. And it stayed reverted for two years.
> >> Could you please either accept this patch, or revert 4dce7d9b ?
> >> (Both alternatives are exactly the same.)
> > Sorry for the late reply. To me reverting (or omitting at the next
> > rebasing merge) this patch sound fine, as it seems to be superseeded by
> > the upstream change.
> > As I can see thats already done on master, so it seems to be all good.
Thank you, Junio, for asking.
(I'm afraid my previous mail was unclear.)
> Are you guys talking about be39048a (git-sh-setup.sh: Add an pwd()
> function for MinGW, 2012-04-17) which has been in since v1.7.11?
This one is ok, keep it. (msysGit has been using an alias instead of
function for several years, but msysGit/master was synced recently.)
> The change introduced by 4dce7d9b (submodules: fix ambiguous
> absolute paths under Windows, 2012-03-04) still exists, but your
> "reverting this patch sound fine" confuses me.
This one was accepted to git, but was reverted in msysGit almost
immediately by 64a8a03. Things stayed that way for 2 years.
So it seems no one has ever actually used this code.
Consequently, I propose to revert 4dce7d9b from git.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html