diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2010-06-12 00:45:35 +0200 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-10-01 23:08:46 +0100 |
| commit | 4e57bafe8bc60e35b9841b22f99882581c466daf (patch) | |
| tree | edcbc70bfb1af1b70c4e7dd6363a4b166bd1b3ef /git-merge-octopus.sh | |
| parent | 442dada22d3b6e511d30b05a80bab153619e52a7 (diff) | |
| download | git-4e57bafe8bc60e35b9841b22f99882581c466daf.tar.gz | |
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>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 615753c83c..8643f74cb0 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" |