Fix bugs in tools/merge-to-branch.sh

tools/common-includes.sh

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
 # scripts in this directory. It is not meant to be executed by itself.
 
 # Important: before including this file, the following variables must be set:
 # - BRANCHNAME
 # - PERSISTFILE_BASENAME
 
 TEMP_BRANCH=$BRANCHNAME-temporary-branch-created-by-script
 VERSION_FILE="src/version.cc"
 CHANGELOG_ENTRY_FILE="$PERSISTFILE_BASENAME-changelog-entry"
 PATCH_FILE="$PERSISTFILE_BASENAME-patch"
+PATCH_OUTPUT_FILE="$PERSISTFILE_BASENAME-patch-output"
 COMMITMSG_FILE="$PERSISTFILE_BASENAME-commitmsg"
 TOUCHED_FILES_FILE="$PERSISTFILE_BASENAME-touched-files"
 TRUNK_REVISION_FILE="$PERSISTFILE_BASENAME-trunkrevision"
 START_STEP=0
 CURRENT_STEP=0
 
 die() {
   [[ -n "$1" ]] && echo "Error: $1"
   echo "Exiting."
   exit 1
 }
 
 confirm() {
   echo -n "$1 [Y/n] "
   read ANSWER
   if [[ -z "$ANSWER" || "$ANSWER" == "Y" || "$ANSWER" == "y" ]] ; then
     return 0
   else
     return 1
   fi
 }
 
 delete_branch() {
-  local MATCH=$(git branch | grep $1 | awk '{print $NF}' )
+  local MATCH=$(git branch | grep "$1" | awk '{print $NF}' | grep -x $1)

[Jakob Kummerow, 2012/03/16 16:01:11]

You don't need the quotes around "$1", but I guess they don't matter.

   if [ "$MATCH" == "$1" ] ; then
     confirm "Branch $1 exists, do you want to delete it?"
     if [ $? -eq 0 ] ; then
       git branch -D $1 || die "Deleting branch '$1' failed."
       echo "Branch $1 deleted."
     else
       die "Can't continue. Please delete branch $1 and try again."
     fi
   fi
 }
@@ skipping 94 matching lines @@
   unset ANSWER
   while [ "$ANSWER" != "LGTM" ] ; do
     [[ -n "$ANSWER" ]] && echo "That was not 'LGTM'."
     echo -n "> "
     read ANSWER
   done
 }
 
 # Takes a file containing the patch to apply as first argument.
 apply_patch() {
-  patch -p1 < "$1" | tee >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")
-  [[ $? -eq 0 ]] || die "Applying the patch failed."
+  patch -p1 < "$1" > "$PATCH_OUTPUT_FILE" || \
+    cat "$PATCH_OUTPUT_FILE" && die "Applying the patch failed."
+  tee < "$PATCH_OUTPUT_FILE" >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")
+  rm "$PATCH_OUTPUT_FILE"
 }
 
 stage_files() {
   # Stage added and modified files.
   TOUCHED_FILES=$(cat "$TOUCHED_FILES_FILE")
   for FILE in $TOUCHED_FILES ; do
     git add "$FILE"
   done
   # Stage deleted files.
   DELETED_FILES=$(git status -s -uno --porcelain | grep "^ D" \
                                                  | awk '{print $NF}')
   for FILE in $DELETED_FILES ; do
     git rm "$FILE"
   done
   rm -f "$TOUCHED_FILES_FILE"
 }