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>
Johannes Schindelin committed
Jun 12, 2010 at 00:45 UTC
4e57bafe8bc60e35b9841b22f99882581c466daf
1 file changed
+5
git-merge-octopus.sh
+5
@@ -61,6 +61,11 @@ do
61
esac
62
63
eval pretty_name=\${GITHEAD_$SHA1:-$SHA1}
64
+ if test "$SHA1" = "$pretty_name"
65
+ then
66
+ SHA1_UP="$(echo "$SHA1" | tr a-z A-Z)"
67
+ eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name}
68
+ fi
69
common=$(git merge-base --all $SHA1 $MRC) ||
70
die "Unable to find common commit with $pretty_name"
71