improve merge commit detection

See codecov/codecov-python#118
codecov · Dec 18, 2017 · beaae43 · blueyed · Dec 19, 2017 · stevepeak
1 parent 8163b8e
commit beaae43
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/codecov b/codecov
@@ -760,11 +760,11 @@ fi
 if [ "$commit_o" = "" ];
 then
   # merge commit -> actual commit
-  mc=$(git log -1 --pretty=%B 2>/dev/null | tr -d '[[:space:]]' || true)
-  if [[ "$mc" =~ ^Merge[[:space:]][a-z0-9]{40}[[:space:]]into[[:space:]][a-z0-9]{40}$ ]];
+  mc=$(git show --no-patch --format="%P" 2>/dev/null | tr -d '[[:space:]]' || echo "")
+  if [[ "$mc" =~ ^[a-z0-9]{40}[[:space:]][a-z0-9]{40}$ ]];
   then
     # Merge xxx into yyy
-    say "    Fixing merge commit sha"
+    say "    Fixing merge commit SHA"
     commit=$(echo "$mc" | cut -d' ' -f2)
   elif [ "$GIT_COMMIT" != "" ];
   then