From 4e57bafe8bc60e35b9841b22f99882581c466daf Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 12 Jun 2010 00:45:35 +0200 Subject: [PATCH] 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 Signed-off-by: Pat Thoyts --- git-merge-octopus.sh | 5 +++++ 1 file changed, 5 insertions(+) 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" -- 2.30.2