[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>
This commit is contained in:
parent
e515f31896
commit
0fc65a4572
@ -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;;
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user