From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 11 Jun 2010 22:45:35 +0000 (+0200)
Subject: merge-octopus: Work around environment issue on Windows
X-Git-Tag: v1.7.4-rc0~193^2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e57bafe8bc60e35b9841b22f99882581c466daf;p=git.git

merge-octopus: Work around environment issue on Windows

For some reason, the environment variables get upper-cased when a
subprocess is launched on Windows. Cope with that.

[PT: fixed typo in the char range noted by junio]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 615753c83..8643f74cb 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -61,6 +61,11 @@ do
 	esac
 
 	eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
+	if test "$SHA1" = "$pretty_name"
+	then
+		SHA1_UP="$(echo "$SHA1" | tr a-z A-Z)"
+		eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
+	fi
 	common=$(git merge-base --all $SHA1 $MRC) ||
 		die "Unable to find common commit with $pretty_name"