From: Linus Torvalds Date: Fri, 29 Apr 2005 21:56:18 +0000 (-0700) Subject: Fix up "applypatch" for the big git rename X-Git-Tag: v0.99.2~51^2~16 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=50eb31d10390f638be2a99f3b064afcd090c08ea;p=git.git Fix up "applypatch" for the big git rename Add "git-" prefixes to git commands. --- diff --git a/applypatch b/applypatch index 397e4a0e..6e214096 100755 --- a/applypatch +++ b/applypatch @@ -57,13 +57,12 @@ echo echo Applying "'$SUBJECT'" echo -check-files $(cat $FILES) || exit 1 -checkout-cache -q $(cat $FILES) || exit 1 +git-check-files $(cat $FILES) || exit 1 +git-checkout-cache -q $(cat $FILES) || exit 1 patch -u --no-backup-if-mismatch -f -p1 --fuzz=0 --input=$PATCHFILE || exit 1 -update-cache --add --remove $(cat $FILES) || exit 1 -tree=$(write-tree) || exit 1 +git-update-cache --add --remove $(cat $FILES) || exit 1 +tree=$(git-write-tree) || exit 1 echo Wrote tree $tree -commit=$(commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1 +commit=$(git-commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1 echo Committed: $commit echo $commit > .git/HEAD -