Re: [PATCH] Windows: Always normalize paths to Windows-style
Stepan Kasal writes:
> 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.
OK, let's do this. I'd like you to take the authorship of it (and
correct any mistake I may have made in the description) with your
sign-off.
Thanks.
-- >8 --
From: Stepan Kasal
Subject: [PATCH] Revert "submodules: fix ambiguous absolute paths under Windows"
This reverts commit 4dce7d9b408b2935b85721b54a2010eda7ec1be9,
which was originally done to help Windows but was almost
immediately reverted in msysGit, and the codebase kept this
unnecessary divergence for almost two years.
Not-Signed-off-yet-by: Stepan Kasal
Signed-off-by: Junio C Hamano
---
git-submodule.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 66f5f75..821e6d4 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -285,9 +285,6 @@ module_clone()
# resolve any symlinks that might be present in $PWD
a=$(cd_to_toplevel && cd "$gitdir" && pwd)/
b=$(cd_to_toplevel && cd "$sm_path" && pwd)/
- # normalize Windows-style absolute paths to POSIX-style absolute paths
- case $a in [a-zA-Z]:/*) a=/${a%%:*}${a#*:} ;; esac
- case $b in [a-zA-Z]:/*) b=/${b%%:*}${b#*:} ;; esac
# Remove all common leading directories after a sanity check
if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then
die "$(eval_gettext "Gitdir '\$a' is part of the submodule path
'\$b' or vice versa")"
--
2.0.0-rc2-397-ga0fd1fc
--
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
Re: [PATCH] Windows: Always normalize paths to Windows-style
Hello, On Wed, May 07, 2014 at 01:40:05PM -0700, Junio C Hamano wrote: > Heiko Voigt 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 > >> 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. Stepan -- 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
Re: [PATCH] Windows: Always normalize paths to Windows-style
Heiko Voigt 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 >> 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. 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? 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. -- 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
Re: [PATCH] Windows: Always normalize paths to Windows-style
Hi, 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 > 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. Cheers Heiko -- 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
Re: [PATCH] Windows: Always normalize paths to Windows-style
The parent of this mail should have started a new thread. Sorry for the typo. Stepan -- 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
[PATCH] Windows: Always normalize paths to Windows-style
From: Heiko Voigt
Date: Thu, 22 Mar 2012 19:17:03 +0100
It appears that `pwd` returns the POSIX-style or the DOS-style path
depending which style the previous `cd` used. To normalize, enforce `pwd
-W` in scripts.
>From the original e-mail exchange:
On Thu, Mar 22, 2012 at 11:13:37AM +0100, Sebastian Schuberth wrote:
> On Wed, Mar 21, 2012 at 22:21, Johannes Sixt wrote:
>
> > I build git and run its tests outside the msysgit environment. Does that
> > explain the difference? (And I use CMD.)
>
> It does not make a difference for me. I started cmd.exe at
> c:\msysgit\git\t, added c:\msysgit\bin temporarily to PATH, and ran
> "sh t5526-fetch-submodules.sh -i -v", and the test still fails.
Yes it probably does. Johannes said that he runs the tests outside of
the msysgit folder. That way there is only one path the submodule script
gets reported and not two like '/c/msysgit/git' and '/git'.
That would explain to me why it is passing.
I am afraid that the only solution is to patch msys itself to report the
long absolute path when passing window style paths to cd. Currently when
I do
cd c:/msysgit/git
I will end up in '/git' instead of the long path.
I found that there is a -W option to pwd in msys bash which makes it
always return the real windows path. A normalization in that direction
is unique and thus might be more robust. Have a look at the attached
patch. With this at least t5526 passes. I was not able to run the whole
testsuite properly at the moment. I can have a look at that tomorrow.
What do you think?
Cheers Heiko
Signed-off-by: Johannes Schindelin
---
Hello,
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
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.)
Have a nice day,
Stepan Kasal
git-submodule.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 4a30087..247273e 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -285,9 +285,6 @@ module_clone()
# resolve any symlinks that might be present in $PWD
a=$(cd_to_toplevel && cd "$gitdir" && pwd)/
b=$(cd_to_toplevel && cd "$sm_path" && pwd)/
- # normalize Windows-style absolute paths to POSIX-style absolute paths
- case $a in [a-zA-Z]:/*) a=/${a%%:*}${a#*:} ;; esac
- case $b in [a-zA-Z]:/*) b=/${b%%:*}${b#*:} ;; esac
# Remove all common leading directories after a sanity check
if test "${a#$b}" != "$a" || test "${b#$a}" != "$b"; then
die "$(eval_gettext "Gitdir '\$a' is part of the submodule path
'\$b' or vice versa")"
--
1.9.2.msysgit.0.158.g6070cee
--
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
