diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-29 16:25:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-29 16:25:05 -0700 |
| commit | 0fc65a4572625405ff6dd9d8c16d835f2b1ebd49 (patch) | |
| tree | c1546808797f6a3c4e6ae82069cee3dc316fbf24 /git-merge-one-file-script | |
| parent | e515f31896844071f9721f114d289139afa8f662 (diff) | |
| download | git-0fc65a4572625405ff6dd9d8c16d835f2b1ebd49.tar.gz git-0fc65a4572625405ff6dd9d8c16d835f2b1ebd49.tar.xz | |
[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>
Diffstat (limited to 'git-merge-one-file-script')
| -rwxr-xr-x | git-merge-one-file-script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script index d00ea9aa6..b521d05ff 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;; |