Merge branch 'maint-1.6.3' into maint
[git/jrn.git] / git-request-pull.sh
blobfd95beadab6aa01fc3fb26c7d72ba182201f8502
1 #!/bin/sh -e
2 # Copyright 2005, Ryan Anderson <ryan@michonline.com>
4 # This file is licensed under the GPL v2, or a later version
5 # at the discretion of Linus Torvalds.
7 USAGE='<start> <url> [<end>]'
8 LONG_USAGE='Summarizes the changes between two commits to the standard output,
9 and includes the given URL in the generated summary.'
10 SUBDIRECTORY_OK='Yes'
11 OPTIONS_SPEC=
12 . git-sh-setup
13 . git-parse-remote
15 GIT_PAGER=
16 export GIT_PAGER
18 base=$1
19 url=$2
20 head=${3-HEAD}
22 [ "$base" ] || usage
23 [ "$url" ] || usage
25 baserev=`git rev-parse --verify "$base"^0` &&
26 headrev=`git rev-parse --verify "$head"^0` || exit
28 merge_base=`git merge-base $baserev $headrev` ||
29 die "fatal: No commits in common between $base and $head"
31 branch=$(git ls-remote "$url" \
32 | sed -n -e "/^$headrev refs.heads./{
33 s/^.* refs.heads.//
36 }")
37 url=$(get_remote_url "$url")
38 if [ -z "$branch" ]; then
39 echo "warn: No branch of $url is at:" >&2
40 git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
41 echo "warn: Are you sure you pushed $head there?" >&2
42 echo >&2
43 echo >&2
44 branch=..BRANCH.NOT.VERIFIED..
45 status=1
48 echo "The following changes since commit $baserev:"
49 git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/ \1/'
51 echo "are available in the git repository at:"
52 echo
53 echo " $url $branch"
54 echo
56 git shortlog ^$baserev $headrev
57 git diff -M --stat --summary $merge_base $headrev
58 exit $status