chiark / gitweb /
Use `git mumble' consistently in place of `git-mumble'.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 29 Apr 2014 23:03:45 +0000 (00:03 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 29 Apr 2014 23:03:45 +0000 (00:03 +0100)
Newer versions of Git don't leave the implementations on the PATH.

convert

diff --git a/convert b/convert
index 60b1998..eb1ca3c 100755 (executable)
--- 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