]> git.madduck.net Git - code/myrepos.git/blobdiff - lib/git-svn

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Add a push subcommand, which pushes committed changes for DCVS, and does nothing...
[code/myrepos.git] / lib / git-svn
index 416a2f9b37453e41cab893b0418fbb056be552de..7e42b8820e986734ce760f5f79dce5895dd27873 100644 (file)
@@ -3,28 +3,33 @@
 # To make mr use this file, add a line like this inside the [DEFAULT]
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
 # To make mr use this file, add a line like this inside the [DEFAULT]
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
+#
+# Note that by default this makes mr update do a git svn fetch.
+# Some might prefer it to do a git svn rebase, if you do, you can
+# configure that as follows in your ~/.mrconfig:
+#git_svn_update = git svn rebase
+git_svn_update = git svn fetch
+git_svn_status = git status "$@" || true
+git_svn_commit = git svn dcommit
+git_svn_push = git svn dcommit
+git_svn_record = git commit -a "$@"
+git_svn_diff = git diff "$@"
+git_svn_log = git svn log "$@"
 
 git_test =
        test -d "$MR_REPO"/.git &&
 
 git_test =
        test -d "$MR_REPO"/.git &&
-       test -z "`git config --get svn-remote.svn.url`"
+       test -z "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
 
 git_svn_test =
        test -d "$MR_REPO"/.git &&
 
 git_svn_test =
        test -d "$MR_REPO"/.git &&
-       test -n "`git config --get svn-remote.svn.url`"
+       test -n "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
        if [ -z "$url" ]; then
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
        if [ -z "$url" ]; then
-               error "cannot determine git-svn url"
+               error "cannot determine git svn url"
        fi
        fi
-       echo "Registering git-svn url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git-svn clone '$url' '$MR_REPO'"
-
-git_svn_update = git-svn fetch
-git_svn_status = git status "$@" || true
-git_svn_commit = git-svn dcommit
-git_svn_record = git commit -a "$@"
-git_svn_diff = git diff "$@"
-git_svn_log = git-svn log "$@"
+       echo "Registering git svn url: $url in $MR_CONFIG"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git svn clone '$url' '$MR_REPO'"
 
 # vim:sw=8:sts=0:ts=8:noet
 
 # vim:sw=8:sts=0:ts=8:noet