Merge branch 'jc/grep-author-all-match-implicit' into maint
[git/jnareb-git/bp-gitweb.git] / git-request-pull.sh
blob630ceddf0356429f7ff71d280ee1056a2eb939c6
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='git request-pull [options] start url [end]
13 p show patch text as well
16 . git-sh-setup
17 . git-parse-remote
19 GIT_PAGER=
20 export GIT_PAGER
22 patch=
23 while case "$#" in 0) break ;; esac
25 case "$1" in
26 -p)
27 patch=-p ;;
28 --)
29 shift; break ;;
30 -*)
31 usage ;;
33 break ;;
34 esac
35 shift
36 done
38 base=$1
39 url=$2
40 head=${3-HEAD}
42 [ "$base" ] || usage
43 [ "$url" ] || usage
45 baserev=`git rev-parse --verify "$base"^0` &&
46 headrev=`git rev-parse --verify "$head"^0` || exit
48 merge_base=`git merge-base $baserev $headrev` ||
49 die "fatal: No commits in common between $base and $head"
51 branch=$(git ls-remote "$url" \
52 | sed -n -e "/^$headrev refs.heads./{
53 s/^.* refs.heads.//
56 }")
57 url=$(get_remote_url "$url")
58 if [ -z "$branch" ]; then
59 echo "warn: No branch of $url is at:" >&2
60 git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
61 echo "warn: Are you sure you pushed $head there?" >&2
62 echo >&2
63 echo >&2
64 branch=..BRANCH.NOT.VERIFIED..
65 status=1
68 echo "The following changes since commit $baserev:"
69 git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/ \1/'
71 echo "are available in the git repository at:"
72 echo
73 echo " $url $branch"
74 echo
76 git shortlog ^$baserev $headrev
77 git diff -M --stat --summary $patch $merge_base..$headrev
78 exit $status