From 5005b07da4ab98791af3b27d66ea18917d5dc901 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 2 Feb 2008 23:19:29 -0500
Subject: [PATCH] yay, even more git-*

---
 lib/git-fake-bare |  6 +++---
 lib/git-svn       | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 140d24d..0c33934 100644
--- 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 &&
-	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="$@"
@@ -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 = 
-	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
-	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
diff --git a/lib/git-svn b/lib/git-svn
index d1e32d8..9457547 100644
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -4,16 +4,16 @@
 # 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:
-#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_commit = git-svn dcommit
+git_svn_commit = git svn dcommit
 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 &&
@@ -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
-		error "cannot determine git-svn url"
+		error "cannot determine git svn url"
 	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
-- 
2.39.2