X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-merge-octopus.sh;h=8643f74cb09f278c37851c418e839c7d160f36ca;hb=49bd56a5f7b09f89b59a6a77d331e8f85f6d7fde;hp=615753c83c38f4a97752d5ca3400beeef4acd5f1;hpb=c329898abb167f05e37f3d0305e833127a26a4d0;p=git.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 615753c83..8643f74cb 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"