yay, even more git-*

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 140d24d60a0ebddb4f87ad4c6d11527a0e8a3a87..0c33934275028542eabb05fb0785e9a24d74112e 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -32,7 +32,7 @@ lib =
 git_fake_bare_test = 
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
 git_fake_bare_test = 
        test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
        test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&

-       test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false
+       test "$(GIT_CONFIG="$MR_REPO"/config git config --get core.bare)" = false

 
 git_fake_bare_update =
        args="$@"
 
 git_fake_bare_update =
        args="$@"


@@ -50,11 +50,11 @@ git_fake_bare_diff = error "diff does not work for fake bare git repositories (y
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 
 git_fake_bare_log = git log "$@"
 
 git_fake_bare_register = 

-       url="$(LC_ALL=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+       url="$(LC_ALL=C GIT_CONFIG=config git config --get remote.origin.url)" || true

        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi

-       worktree="$(git-config --get core.worktree)" || true
+       worktree="$(git config --get core.worktree)" || true

        if [ -z "$worktree" ]; then
                error "git worktree is not set"
        fi
        if [ -z "$worktree" ]; then
                error "git worktree is not set"
        fi

diff --git a/lib/git-svn b/lib/git-svn
index d1e32d8e3e794500eeacd2b29467b66957caa1c2..9457547d5fbef6f2469349ed8d14add02f3a4430 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -4,16 +4,16 @@
 # section of your ~/.mrconfig
 #include = cat /usr/share/mr/git-svn
 #
 # 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
+# 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:
 # configure that as follows in your ~/.mrconfig:

-#git_svn_update = git-svn rebase
-git_svn_update = git-svn fetch
+#git_svn_update = git svn rebase
+git_svn_update = git svn fetch

 git_svn_status = git status "$@" || true
 git_svn_status = git status "$@" || true

-git_svn_commit = git-svn dcommit
+git_svn_commit = git svn dcommit

 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"

-git_svn_log = git-svn log "$@"
+git_svn_log = git svn log "$@"

 
 git_test =
        test -d "$MR_REPO"/.git &&
 
 git_test =
        test -d "$MR_REPO"/.git &&


@@ -26,9 +26,9 @@ git_svn_test =
 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'"
+       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