Skip to content
Browse files

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>
  • Loading branch information...
1 parent 442dada commit 4e57bafe8bc60e35b9841b22f99882581c466daf @dscho dscho committed with patthoyts Jun 12, 2010
Showing with 5 additions and 0 deletions.
  1. +5 −0 git-merge-octopus.sh
View
5 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"

0 comments on commit 4e57baf

Please sign in to comment.
Something went wrong with that request. Please try again.