1 #!/bin/bash 2 3 if [ $# -ne 1 ]; then 4 echo "Invalid arguments!" 5 echo "$0 <rNNNNNN | git-hash>" 6 exit 1 7 fi 8 9 if [ -n "$(git status -uno -s --porcelain)" ]; then 10 echo "You have unstashed changes. Please stash and then revert." 11 git status -uno 12 exit 1 13 fi 14 15 COMMIT=$1 16 OTHER=$(git svn find-rev "$COMMIT") 17 if [ $? -ne 0 ]; then 18 echo "Error! Could not find an svn/git revision for commit $COMMIT!" 19 exit 1 20 fi 21 22 if [ -n "$(echo $COMMIT | grep '^r[0-9]\+')" ]; then 23 SVN=`echo $COMMIT | sed -e 's/^r//'` 24 GIT=$OTHER 25 else 26 SVN=$OTHER 27 GIT=$COMMIT 28 fi 29 30 # Grab the one line message for our revert commit message. 31 ONE_LINE_MSG=$(git log --oneline $GIT -1 | cut -f2- -d " ") 32 33 # Revert the commit. 34 git revert --no-commit $GIT 2>/dev/null 35 if [ $? -ne 0 ]; then 36 echo "Error! Failed to revert commit r$SVN. Resetting to head." 37 git reset --hard HEAD 38 exit 1 39 fi 40 41 # Create a template in our .git directory. 42 TEMPLATE="`git rev-parse --git-dir`/git-svn-revert-template" 43 cat > $TEMPLATE <<EOF 44 Revert "$ONE_LINE_MSG" 45 46 This reverts commit r$SVN. 47 EOF 48 49 # Begin the commit but give our user an opportunity to edit it. 50 git commit --file="$TEMPLATE" --edit 51 if [ $? -ne 0 ]; then 52 echo "Error! Failed to commit reverting commit for commit r$SVN. Reverting to head." 53 git reset --hard HEAD 54 rm -rf $TEMPLATE 55 exit 1 56 fi 57 58 rm -rf $TEMPLATE 59 60
