{"thread":{"id":"399","subject":"[PATCH] leftover bits for git rename","startedAt":"2005-04-29T22:42:09Z","lastAt":"2005-04-29T22:42:09Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"2211","messageId":"7voebx2oji.fsf@assigned-by-dhcp.cox.net","threadId":"399","inReplyTo":null,"subject":"[PATCH] leftover bits for git rename","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-04-29T22:42:09Z","receivedAt":"2005-04-29T22:42:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"  commit 2d280e1c5e6fdcf5428e60219eae14a2c6629c51\n  parent aed7a5a9dab96d1a17be4fadf7685086047178cc\n  author Linus Torvalds <torvalds@ppc970.osdl.org> Fri Apr 29 15:02:43 2005\n  committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri Apr 29 15:02:43 2005\n\n    Update the merge scripts for the big git rename.\n\n    Let's see what else I forgot..\n\nNot that many, but here they are.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n----\n\ngit-merge-one-file-script |    6 +++---\ngit-prune-script          |    2 +-\ngit-tag-script            |    2 +-\n\ncd /opt/packrat/playpen/public/in-place/git/git.linus/\njit-snap -v 0\n# - [PATCH] Makefile: The big git command renaming fallout fix.\n# + working tree\n--- k/git-merge-one-file-script  (mode:100755)\n+++ l/git-merge-one-file-script  (mode:100755)\n@@ -9,7 +9,7 @@\n #\n #\n # Handle some trivial cases.. The _really_ trivial cases have\n-# been handled already by read-tree, but that one doesn't\n+# been handled already by git-read-tree, but that one doesn't\n # do any merges that migth change the tree layout\n #\n \n@@ -41,7 +41,7 @@ case \"${1:-.}${2:-.}${3:-.}\" in\n #\n \".$2.\" | \"..$3\" )\n \techo \"Adding $4 with perm $6$7\"\n-\tmv $(unpack-file \"$2$3\") $4\n+\tmv $(git-unpack-file \"$2$3\") $4\n \tchmod \"$6$7\" $4\n \tgit-update-cache --add -- $4\n \texit 0\n@@ -55,7 +55,7 @@ case \"${1:-.}${2:-.}${3:-.}\" in\n \t\texit 1\n \tfi\n \techo \"Adding $4 with perm $6\"\n-\tmv $(unpack-file \"$2\") $4\n+\tmv $(git-unpack-file \"$2\") $4\n \tchmod \"$6\" $4\n \tgit-update-cache --add -- $4\n \texit 0;;\n--- k/git-prune-script  (mode:100755)\n+++ l/git-prune-script  (mode:100755)\n@@ -1,2 +1,2 @@\n #!/bin/sh\n-fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\\(..\\):.git/objects/\\1/:' | xargs rm\n+git-fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\\(..\\):.git/objects/\\1/:' | xargs rm\n--- k/git-tag-script  (mode:100755)\n+++ l/git-tag-script  (mode:100755)\n@@ -1,6 +1,6 @@\n #!/bin/sh\n object=${2:-$(cat .git/HEAD)}\n-type=$(cat-file -t $object) || exit 1\n+type=$(git-cat-file -t $object) || exit 1\n ( echo -e \"object $object\\ntype $type\\ntag $1\\n\"; cat ) > .tmp-tag\n rm -f .tmp-tag.asc\n gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag\n\n\n"}]}