From 19c37352626531efe1a8128a168804a4bb5adc86 Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Fri, 26 Apr 2013 00:58:45 +0000 Subject: Added the scripts git-svnup/git-svnrevert to utils/git-svn. It makes more sense to have git-svnup here than catting said file in the documentation (where we should rather point users to this directory). I included git-svnrevert as an additional gift to the community. I will update the documentation in a second commit later today. git-svnrevert takes in a git hash for a commit, looks up the svn revision for said commit and then creates the normal git revert commit message with the one liner message, except instead of saying Revert "<<>>" This reverts commit <<>> It says: Revert "<<>>" This reverts commit r<<>> so git hashes will not escape into our svn logs (which just look unseemly). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180587 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/git-svn/git-svnup | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 utils/git-svn/git-svnup (limited to 'utils/git-svn/git-svnup') diff --git a/utils/git-svn/git-svnup b/utils/git-svn/git-svnup new file mode 100755 index 0000000000..3321f6ba08 --- /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 -- cgit v1.2.3-70-g09d2