X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applypatch.sh;h=e4b09472e1fa27a6431b431572af7353c4f0a9b2;hb=ce0bd64299ae148ef61a63edcac635de41254cb5;hp=4c577eb835b877dd0766edbc5a603ee4e3db049a;hpb=9cac9d368934f68e75810df95211a6522d4d139e;p=git.git diff --git a/git-applypatch.sh b/git-applypatch.sh index 4c577eb8..e4b09472 100755 --- 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 ## + +USAGE=' []' . git-sh-setup +case "$#" in 3|4) ;; *) usage ;; esac + 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 -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;; @@ -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 -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