summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <klto@zhaw.ch>2010-01-04 14:24:50 +0100
committerTobias Klauser <klto@zhaw.ch>2010-01-04 14:24:50 +0100
commitd24b014e2dcb93e65c022c0a91cde3dbd26a238a (patch)
tree45618fd912d0dc2728baa1a634391ed463c82a4e
parentfca82126ffd1529b3e99863da562f86a5f8723d9 (diff)
Change directory instead of setting GIT_DIR, correct tag ref path
-rwxr-xr-xgit2svn-sync9
1 files changed, 6 insertions, 3 deletions
diff --git a/git2svn-sync b/git2svn-sync
index dbb4fc4..b63d468 100755
--- a/git2svn-sync
+++ b/git2svn-sync
@@ -17,14 +17,17 @@ if [ ! -d $GIT_SVN_REPO_CHECKOUT/.git/svn ] ; then
exit 3
fi
-export GIT_DIR=$GIT_SVN_REPO_CHECKOUT
+p=$(pwd)
+cd $GIT_SVN_REPO_CHECKOUT
git fetch $GIT_REPO
git branch tmp $(cut -b-40 .git/FETCH_HEAD)
git tag -a -m "Last fetch" newlast tmp
git rebase --onto master last tmp
git branch -M tmp master
git svn dcommit
-mv $GIT_SVN_REPO_CHECKOUT/.git/refs/newlast \
- $GIT_SVN_REPO_CHECKOUT/.git/refs/last
+mv $GIT_SVN_REPO_CHECKOUT/.git/refs/tags/newlast \
+ $GIT_SVN_REPO_CHECKOUT/.git/refs/tags/last
+
+cd $p
# vim:ft=sh