mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] leftover bits for git rename

Browse Source 
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:
Junio C Hamano
2005-04-29 16:25:05 -07:00
committed by Linus Torvalds
parent e515f31896
commit 0fc65a4572
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-merge-one-file-script
View File

@ -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;;