undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-octopus: Work around environment issue on Windows

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2010-06-12 00:45:35 +02:00 committed by Pat Thoyts
parent 442dada22d
commit 4e57bafe8b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-merge-octopus.sh
View File

@ -61,6 +61,11 @@ do
esac esac
eval pretty_name=\${GITHEAD_$SHA1:-$SHA1} 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) || common=$(git merge-base --all $SHA1 $MRC) ||
die "Unable to find common commit with $pretty_name" die "Unable to find common commit with $pretty_name"