summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-merge-one-file-script6
-rwxr-xr-xgit-prune-script2
-rwxr-xr-xgit-tag-script2
3 files changed, 5 insertions, 5 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index d00ea9a..b521d05 100755
--- 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
-# 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
#
@@ -41,7 +41,7 @@ case "${1:-.}${2:-.}${3:-.}" in
#
".$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
@@ -55,7 +55,7 @@ case "${1:-.}${2:-.}${3:-.}" in
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;;
diff --git a/git-prune-script b/git-prune-script
index d0f19f1..b6e927a 100755
--- a/git-prune-script
+++ b/git-prune-script
@@ -1,2 +1,2 @@
#!/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 233491b..ccc75dc 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,6 +1,6 @@
#!/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