[PATCH 2/2] git-sh-setup: work around Cygwin path handling gotchas

From: Junio C Hamano <gitster@pobox.com>
Date: May 16, 2012, 18:00 UTC
Message-ID: <1337191208-21110-3-git-send-email-gitster@pobox.com>
In-Reply-To: <1337191208-21110-1-git-send-email-gitster@pobox.com>

From: Steven Penny <svnpenn@gmail.com>

From: Steven Penny <svnpenn@gmail.com>

On Cygwin, tools built for Cygwin can take both Windows-style paths
(e.g. C:/dir/file.txt or C:\dir\file.txt) and Cygwin-style paths
(e.g. /cygdrive/c/dir/file.txt), but Windows-native tools can only take
Windows-style paths.  Because the paths that are relative to $GIT_DIR,
e.g. the name of the insn sheet file of the "rebase -i" command, are given
to the programs with $GIT_DIR prefixed, and $GIT_DIR in turn is computed
by calling "pwd", wrap "pwd" to call "cygpath -m" to give a Windows-style
path, in a way similar to how mingw does this.
---
 git-sh-setup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 770a86e..f0f941d 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -241,6 +241,11 @@ case $(uname -s) in
 		return 1
 	}
 	;;
+*CYGWIN*)
+	pwd () {
+		builtin cygpath -m
+	}
+	;;
 *)
 	is_absolute_path () {
 		case "$1" in

-- 
1.7.10.2.537.g0ac6509