summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2010-06-11 22:45:35 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2010-10-01 22:08:46 (GMT)
commit4e57bafe8bc60e35b9841b22f99882581c466daf (patch)
treeedcbc70bfb1af1b70c4e7dd6363a4b166bd1b3ef
parent442dada22d3b6e511d30b05a80bab153619e52a7 (diff)
downloadgit-4e57bafe8bc60e35b9841b22f99882581c466daf.zip
git-4e57bafe8bc60e35b9841b22f99882581c466daf.tar.gz
git-4e57bafe8bc60e35b9841b22f99882581c466daf.tar.bz2
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>
-rwxr-xr-xgit-merge-octopus.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 615753c..8643f74 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"