[PATCH] leftover bits for git rename

Linus said:

"Let's see what else I forgot.."

Not that many, but here they are.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index d00ea9aa6f7948d7f9d9f52f12f817eb229c639e..b521d05ffeefd7ed76dcfa283e7f974a684e9dfd 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -9,7 +9,7 @@
 #
 #
 # Handle some trivial cases.. The _really_ trivial cases have
 #
 #
 # Handle some trivial cases.. The _really_ trivial cases have

-# been handled already by read-tree, but that one doesn't
+# been handled already by git-read-tree, but that one doesn't

 # do any merges that migth change the tree layout
 #
 
 # do any merges that migth change the tree layout
 #
 


@@ -41,7 +41,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 ".$2." | "..$3" )
        echo "Adding $4 with perm $6$7"
 #
 ".$2." | "..$3" )
        echo "Adding $4 with perm $6$7"

-       mv $(unpack-file "$2$3") $4
+       mv $(git-unpack-file "$2$3") $4

        chmod "$6$7" $4
        git-update-cache --add -- $4
        exit 0
        chmod "$6$7" $4
        git-update-cache --add -- $4
        exit 0


@@ -55,7 +55,7 @@ case "${1:-.}${2:-.}${3:-.}" in
                exit 1
        fi
        echo "Adding $4 with perm $6"
                exit 1
        fi
        echo "Adding $4 with perm $6"

-       mv $(unpack-file "$2") $4
+       mv $(git-unpack-file "$2") $4

        chmod "$6" $4
        git-update-cache --add -- $4
        exit 0;;
        chmod "$6" $4
        git-update-cache --add -- $4
        exit 0;;

diff --git a/git-prune-script b/git-prune-script
index d0f19f19e2e5ea917bd2a8bf6214aa52fdc83bbc..b6e927a749a95614fed1f0e651417edbec84eb56 100755 (executable)
--- a/git-prune-script
+++ b/git-prune-script
@@ -1,2 +1,2 @@
 #!/bin/sh
 #!/bin/sh

-fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs rm
+git-fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs rm

diff --git a/git-tag-script b/git-tag-script
index 233491bc633aaa21337bfb5ba1b01369d0ea6d89..ccc75dcfbdd70e738f088a43aec9dc2866e3923c 100755 (executable)
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,6 +1,6 @@
 #!/bin/sh
 object=${2:-$(cat .git/HEAD)}
 #!/bin/sh
 object=${2:-$(cat .git/HEAD)}

-type=$(cat-file -t $object) || exit 1
+type=$(git-cat-file -t $object) || exit 1

 ( echo -e "object $object\ntype $type\ntag $1\n"; cat ) > .tmp-tag
 rm -f .tmp-tag.asc
 gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
 ( echo -e "object $object\ntype $type\ntag $1\n"; cat ) > .tmp-tag
 rm -f .tmp-tag.asc
 gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag