From 2a87cbc4a3c88cdccbf8b1229139d11754ff66aa Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 30 Apr 2014 00:03:45 +0100
Subject: [PATCH] Use `git mumble' consistently in place of `git-mumble'.

Newer versions of Git don't leave the implementations on the PATH.
---
 convert | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/convert b/convert
index 60b1998..eb1ca3c 100755
--- a/convert
+++ b/convert
@@ -43,7 +43,7 @@ graftmergein () {
 	local branchname=branch-$desc
 	mkdir -p .git/info
 	local branchtip=`git rev-parse $branchname~0`
-	local oldparents=`git-log -n1 --pretty=format:%P $mergecommit`
+	local oldparents=`git log -n1 --pretty=format:%P $mergecommit`
 	cat <<END >>.git/info/grafts
 $2 $oldparents $branchtip
 END
@@ -102,11 +102,11 @@ perl -ne '
 FEND
 chmod +x $tmp/msg-filter
 
-git-filter-branch --msg-filter $tmp/msg-filter \
-	`git-show-ref | awk '{print $2}'`
+git filter-branch --msg-filter $tmp/msg-filter \
+	`git show-ref | awk '{print $2}'`
 
-git-show-ref | awk '{print $2}' | grep '^refs/original/' \
-	| xargs -n1 git-update-ref -d
+git show-ref | awk '{print $2}' | grep '^refs/original/' \
+	| xargs -n1 git update-ref -d
 
 rm -rf $tmp/converted
 mkdir $tmp/converted
-- 
2.30.2