diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-26 11:47:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-07-27 11:53:48 -0700 |
| commit | 9969b649999a04d6ce8eebccfc1ee766f6e5377a (patch) | |
| tree | 175ae3967a10dc1717bfb9d62e345db35f91b36f /git-request-pull-script | |
| parent | ab421d2c7886341c246544bc8dea43c66a44d909 (diff) | |
| download | git-9969b649999a04d6ce8eebccfc1ee766f6e5377a.tar.gz git-9969b649999a04d6ce8eebccfc1ee766f6e5377a.tar.xz | |
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 <junkio@cox.net>
Diffstat (limited to 'git-request-pull-script')
| -rwxr-xr-x | git-request-pull-script | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/git-request-pull-script b/git-request-pull-script index 329cfc4b8..919081522 100755 --- a/git-request-pull-script +++ b/git-request-pull-script @@ -6,31 +6,30 @@ usage() { - echo "$0 <commit> <filename> <url>" - echo " Summarizes the changes since <commit>, stores them in <filename>" + echo "$0 <commit> <url> [ <head> ]" + echo " Summarizes the changes since <commit> to the standard output," echo " and includes <url> 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 |