projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HTTP cleanup
[git.git]
/
git-applypatch.sh
diff --git
a/git-applypatch.sh
b/git-applypatch.sh
index
4c577eb
..
e4b0947
100755
(executable)
--- a/
git-applypatch.sh
+++ b/
git-applypatch.sh
@@
-10,8
+10,12
@@
## $3 - "info" file with Author, email and subject
## $4 - optional file containing signoff to add
##
## $3 - "info" file with Author, email and subject
## $4 - optional file containing signoff to add
##
+
+USAGE='<msg> <patch> <info> [<signoff>]'
. git-sh-setup
. git-sh-setup
+case "$#" in 3|4) ;; *) usage ;; esac
+
final=.dotest/final-commit
##
## If this file exists, we ask before applying
final=.dotest/final-commit
##
## If this file exists, we ask before applying
@@
-83,7
+87,7
@@
while [ "$interactive" = yes ]; do
echo "--------------------------"
cat "$final"
echo "--------------------------"
echo "--------------------------"
cat "$final"
echo "--------------------------"
-
echo -n
"Apply? [y]es/[n]o/[e]dit/[a]ccept all "
+
printf
"Apply? [y]es/[n]o/[e]dit/[a]ccept all "
read reply
case "$reply" in
y|Y) interactive=no;;
read reply
case "$reply" in
y|Y) interactive=no;;
@@
-200,7
+204,7
@@
echo Wrote tree $tree
parent=$(git-rev-parse --verify HEAD) &&
commit=$(git-commit-tree $tree -p $parent <"$final") || exit 1
echo Committed: $commit
parent=$(git-rev-parse --verify HEAD) &&
commit=$(git-commit-tree $tree -p $parent <"$final") || exit 1
echo Committed: $commit
-git-update-ref HEAD $commit $parent || exit
+git-update-ref
-m "applypatch: $SUBJECT"
HEAD $commit $parent || exit
if test -x "$GIT_DIR"/hooks/post-applypatch
then
if test -x "$GIT_DIR"/hooks/post-applypatch
then