From 9969b649999a04d6ce8eebccfc1ee766f6e5377a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 26 Jul 2005 11:47:31 -0700 Subject: request-pull: minor tweaks. - use --verify to make sure rev param is a rev, and barf otherwise. - make it always output to stdout; no funny business with tee. - take optional branch head name to specify which branch to summarize. - show baserev in a human readable way. - do not depend on diffstat; use git-apply --stat instead. Signed-off-by: Junio C Hamano --- git-request-pull-script | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'git-request-pull-script') diff --git a/git-request-pull-script b/git-request-pull-script index 329cfc4b8f..9190815229 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 -- cgit v1.2.3