Merge branch 'jc/commit-amend-no-edit'
[git/jrn.git] / git-request-pull.sh
blobc6a5b7a6b38adaafdebb4b0991cc5ee8c14c3796
1 #!/bin/sh
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_KEEPDASHDASH=
12 OPTIONS_SPEC='git request-pull [options] start url [end]
14 p show patch text as well
17 . git-sh-setup
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 url=$2 head=${3-HEAD} status=0 branch_name=
40 headref=$(git symbolic-ref -q "$head")
41 if git show-ref -q --verify "$headref"
42 then
43 branch_name=${headref#refs/heads/}
44 if test "z$branch_name" = "z$headref" ||
45 ! git config "branch.$branch_name.description" >/dev/null
46 then
47 branch_name=
51 tag_name=$(git describe --exact "$head^0" 2>/dev/null)
53 test -n "$base" && test -n "$url" || usage
54 baserev=$(git rev-parse --verify "$base"^0) &&
55 headrev=$(git rev-parse --verify "$head"^0) || exit
57 merge_base=$(git merge-base $baserev $headrev) ||
58 die "fatal: No commits in common between $base and $head"
60 find_matching_branch="/^$headrev "'refs\/heads\//{
61 s/^.* refs\/heads\///
65 branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch")
66 url=$(git ls-remote --get-url "$url")
68 git show -s --format='The following changes since commit %H:
70 %s (%ci)
72 are available in the git repository at:
73 ' $baserev &&
74 echo " $url${branch+ $branch}" &&
75 git show -s --format='
76 for you to fetch changes up to %H:
78 %s (%ci)
80 ----------------------------------------------------------------' $headrev &&
82 if test -n "$branch_name"
83 then
84 echo "(from the branch description for $branch local branch)"
85 echo
86 git config "branch.$branch_name.description"
87 fi &&
89 if test -n "$tag_name"
90 then
91 git cat-file tag "$tag_name" |
92 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
93 echo
94 fi &&
96 if test -n "$branch_name" || test -n "$tag_name"
97 then
98 echo "----------------------------------------------------------------"
99 fi &&
101 git shortlog ^$baserev $headrev &&
102 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
104 if test -z "$branch"
105 then
106 echo "warn: No branch of $url is at:" >&2
107 git show -s --format='warn: %h: %s' $headrev >&2
108 echo "warn: Are you sure you pushed '$head' there?" >&2
109 status=1
111 exit $status