push-to-trunk.sh: correctly detect existing branches, git-rm deleted files

tools/push-to-trunk.sh

 #!/bin/bash
 # Copyright 2011 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
@@ skipping 56 matching lines @@
   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)
+  local MATCH=$(git branch | grep $1 | awk '{print $NF}' )
   if [ "$MATCH" == "$1" ] ; then
     confirm "Branch $1 exists, do you want to delete it?"
     if [ $? -eq 0 ] ; then
-      git branch -D $1
+      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
 }
 
 # Persist and restore variables to support canceling/resuming execution
 # of this script.
 persist() {
@@ skipping 253 matching lines @@
 if [ $STEP -le 12 ] ; then
   echo ">>> Step 12: Create a new branch from trunk."
   git checkout -b $TRUNKBRANCH svn/trunk \
     || die "Checking out a new branch '$TRUNKBRANCH' failed."
 fi
 
 if [ $STEP -le 13 ] ; then
   echo ">>> Step 13: Apply squashed changes."
   patch -p1 < "$PATCH_FILE" | tee >(awk '{print $NF}' >> "$TOUCHED_FILES_FILE")
   [[ $? -eq 0 ]] || die "Applying the patch to trunk failed."
+  # 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 "$PATCH_FILE"
   rm -f "$TOUCHED_FILES_FILE"
 fi
 
 if [ $STEP -le 14 ] ; then
   echo ">>> Step 14: Set correct version for trunk."
   restore_if_unset "MAJOR"
   restore_if_unset "MINOR"
   restore_if_unset "BUILD"
   sed -e "/#define MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \
@@ skipping 46 matching lines @@
   echo ">>> Step 20: Done!"
   restore_if_unset "MAJOR"
   restore_if_unset "MINOR"
   restore_if_unset "BUILD"
   echo "Congratulations, you have successfully created the trunk revision \
 $MAJOR.$MINOR.$BUILD. Please don't forget to update the v8rel spreadsheet, \
 and to roll this new version into Chromium."
   # Clean up all temporary files.
   rm -f "$PERSISTFILE_BASENAME"*
 fi