global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 20:20:08 +01:00
Code Issues 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.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-06-12 00:45:35 +02:00
parent 2ac4fa8606
commit b6f9accaa9
1 changed files with 5 additions and 0 deletions
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
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"