зеркало из https://github.com/microsoft/git.git
Fix up "applypatch" for the big git rename
Add "git-" prefixes to git commands.
This commit is contained in:
Родитель
ad4e9ce4f9
Коммит
50eb31d103
11
applypatch
11
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
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче