Merge branch 'mg/texinfo-5' into maint
[git/mjg.git] / git-request-pull.sh
blobd566015975d317683c89bfcfde93ae998efd1058
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 # $head is the token given from the command line, and $tag_name, if
61 # exists, is the tag we are going to show the commit information for.
62 # If that tag exists at the remote and it points at the commit, use it.
63 # Otherwise, if a branch with the same name as $head exists at the remote
64 # and their values match, use that instead.
66 # Otherwise find a random ref that matches $headrev.
67 find_matching_ref='
68 sub abbr {
69 my $ref = shift;
70 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
71 return $ref;
72 } else {
73 return $ref;
77 my ($tagged, $branch, $found);
78 while (<STDIN>) {
79 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
80 next unless ($sha1 eq $ARGV[1]);
81 $found = abbr($ref);
82 if ($deref && $ref eq "tags/$ARGV[2]") {
83 $tagged = $found;
84 last;
86 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
87 $exact = $found;
90 if ($tagged) {
91 print "$tagged\n";
92 } elsif ($exact) {
93 print "$exact\n";
94 } elsif ($found) {
95 print "$found\n";
99 ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
101 url=$(git ls-remote --get-url "$url")
103 git show -s --format='The following changes since commit %H:
105 %s (%ci)
107 are available in the git repository at:
108 ' $merge_base &&
109 echo " $url${ref+ $ref}" &&
110 git show -s --format='
111 for you to fetch changes up to %H:
113 %s (%ci)
115 ----------------------------------------------------------------' $headrev &&
117 if test -n "$branch_name"
118 then
119 echo "(from the branch description for $branch_name local branch)"
120 echo
121 git config "branch.$branch_name.description"
122 fi &&
124 if test -n "$tag_name"
125 then
126 if test -z "$ref" || test "$ref" != "tags/$tag_name"
127 then
128 echo >&2 "warn: You locally have $tag_name but it does not (yet)"
129 echo >&2 "warn: appear to be at $url"
130 echo >&2 "warn: Do you want to push it there, perhaps?"
132 git cat-file tag "$tag_name" |
133 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
134 echo
135 fi &&
137 if test -n "$branch_name" || test -n "$tag_name"
138 then
139 echo "----------------------------------------------------------------"
140 fi &&
142 git shortlog ^$baserev $headrev &&
143 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
145 if test -z "$ref"
146 then
147 echo "warn: No branch of $url is at:" >&2
148 git show -s --format='warn: %h: %s' $headrev >&2
149 echo "warn: Are you sure you pushed '$head' there?" >&2
150 status=1
152 exit $status