diff options
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/git-svn/git-svnrevert | 53 | ||||
-rwxr-xr-x | utils/git-svn/git-svnup | 15 |
2 files changed, 68 insertions, 0 deletions
diff --git a/utils/git-svn/git-svnrevert b/utils/git-svn/git-svnrevert new file mode 100755 index 0000000..de4ff1c --- /dev/null +++ b/utils/git-svn/git-svnrevert @@ -0,0 +1,53 @@ +#!/bin/bash + +if [ $# -ne 1 ]; then + echo "Invalid arguments!" + echo "$0 <commit to revert>" + exit 1 +fi + +if [ -n "$(git status -uno -s --porcelain)" ]; then + echo "You have unstashed changes. Please stash and then revert." + git status -uno + exit 1 +fi + +COMMIT=$1 + +SVN_REVISION=$(git log -1 $COMMIT | grep git-svn-id | tr -s "@" " " | cut -f 4 -d " ") + +if [ -z "$SVN_REVISION" ]; then + echo "Error! Given commit is not a git-svn revision!" + exit 1 +fi + +# Grab the one line message for our revert commit message. +ONE_LINE_MSG=$(git log --oneline $COMMIT -1 | cut -f2- -d " ") + +# Revert the commit. +git revert --no-commit $COMMIT 2>/dev/null +if [ $? -ne 0 ]; then + echo "Error! Failed to revert commit $COMMIT. Resetting to head." + git reset --hard HEAD + exit 1 +fi + +# Create a template in our .git directory. +TEMPLATE="`git rev-parse --git-dir`/git-svn-revert-template" +cat > $TEMPLATE <<EOF +Revert "$ONE_LINE_MSG" + +This reverts commit r$SVN_REVISION. +EOF + +# Begin the commit but give our user an opportunity to edit it. +git commit --file="$TEMPLATE" --edit +if [ $? -ne 0 ]; then + echo "Error! Failed to commit reverting commit for commit $COMMIT. Reverting to head." + git reset --hard HEAD + rm -rf $TEMPLATE + exit 1 +fi + +rm -rf $TEMPLATE + diff --git a/utils/git-svn/git-svnup b/utils/git-svn/git-svnup new file mode 100755 index 0000000..3321f6b --- /dev/null +++ b/utils/git-svn/git-svnup @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -n "`git status -uno -s --porcelain`" ]; then + echo "You have unstashed changes. Can not update repository..." + git status -uno + exit 1 +fi + +git fetch +OLD_BRANCH=$(git rev-parse --abbrev-ref HEAD) +git checkout master 2> /dev/null +git svn rebase -l +git checkout $OLD_BRANCH 2> /dev/null + +exit 0 |