Bug 1832854 - pt8 - cleaner long-sha lookup in fast-forward-libwebrtc…

….sh . r=ng DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D180119

dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

@@ -115,17 +115,16 @@ function write_commit_message_file {
   echo "-------"
   echo "------- Write commit message file ($TMP_DIR/commit_msg.txt)"
   echo "-------"
-  UPSTREAM_SHA=`cd $MOZ_LIBWEBRTC_SRC && \
-      git show --name-only $MOZ_LIBWEBRTC_NEXT_BASE \
-      | grep "^commit " | awk '{ print $NF }'`
+  UPSTREAM_LONG_SHA=`cd $MOZ_LIBWEBRTC_SRC && \
+      git show --format='%H' --no-patch $MOZ_LIBWEBRTC_NEXT_BASE`
   echo "Bug $MOZ_FASTFORWARD_BUG - Vendor libwebrtc from $MOZ_LIBWEBRTC_NEXT_BASE" \
       > $TMP_DIR/commit_msg.txt
   echo "" >> $TMP_DIR/commit_msg.txt
   if [ -f $STATE_DIR/$MOZ_LIBWEBRTC_NEXT_BASE.no-op-cherry-pick-msg ]; then
     cat $STATE_DIR/$MOZ_LIBWEBRTC_NEXT_BASE.no-op-cherry-pick-msg >> $TMP_DIR/commit_msg.txt
     echo "" >> $TMP_DIR/commit_msg.txt
   fi
-  echo "Upstream commit: https://webrtc.googlesource.com/src/+/$UPSTREAM_SHA" >> $TMP_DIR/commit_msg.txt
+  echo "Upstream commit: https://webrtc.googlesource.com/src/+/$UPSTREAM_LONG_SHA" >> $TMP_DIR/commit_msg.txt
   (cd $MOZ_LIBWEBRTC_SRC && \
   git show --name-only $MOZ_LIBWEBRTC_NEXT_BASE | grep "^ ") >> $TMP_DIR/commit_msg.txt
 }