X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-request-pull-script;h=ae6cd272bab01ba7fa9ac7378fe33e07e853d307;hb=f5f2c52bb08a7fc5bde6a7eb6552235df9daca71;hp=329cfc4b8ffa63094826c1c10dc185c96b3f969d;hpb=ab421d2c7886341c246544bc8dea43c66a44d909;p=git.git diff --git a/git-request-pull-script b/git-request-pull-script index 329cfc4b..ae6cd272 100755 --- a/git-request-pull-script +++ b/git-request-pull-script @@ -6,31 +6,30 @@ usage() { - echo "$0 " - echo " Summarizes the changes since , stores them in " + echo "$0 [ ]" + echo " Summarizes the changes since to the standard output," echo " and includes in the message generated." exit 1 } - revision=$1 -filename=$2 -url=$3 +url=$2 +head=${3-HEAD} [ "$revision" ] || usage -[ "$filename" ] || usage [ "$url" ] || usage -baserev=`git-rev-parse $revision` +baserev=`git-rev-parse --verify "$revision"^0` && +headrev=`git-rev-parse --verify "$head"^0` || exit -( - echo "The git repository at:" - echo " $url" - echo "contains the following changes since commit $baserev" - echo "" - git log $revision.. | git-shortlog ; - git diff $revision.. | diffstat ; -) | tee $filename +echo "The following changes since commit $baserev:" +git log --max-count=1 --pretty=short "$baserev" | +git-shortlog | sed -e 's/^\(.\)/ \1/' -echo "The above message is also stored in $filename" +echo "are found in the git repository at:" +echo +echo " $url" +echo +git log $baserev..$headrev | git-shortlog ; +git diff $baserev..$headrev | git-apply --stat --summary