Merge branch 'jn/bisect-coding-style'
[git/mingw.git] / git-request-pull.sh
blobcf4f1505a54bb6d2fdd580ab7e8186dc8103de49
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_STUCKLONG=
13 OPTIONS_SPEC='git request-pull [options] start url [end]
15 p show patch text as well
18 . git-sh-setup
20 GIT_PAGER=
21 export GIT_PAGER
23 patch=
24 while case "$#" in 0) break ;; esac
26 case "$1" in
27 -p)
28 patch=-p ;;
29 --)
30 shift; break ;;
31 -*)
32 usage ;;
34 break ;;
35 esac
36 shift
37 done
39 base=$1 url=$2 head=${3-HEAD} status=0 branch_name=
41 headref=$(git symbolic-ref -q "$head")
42 if git show-ref -q --verify "$headref"
43 then
44 branch_name=${headref#refs/heads/}
45 if test "z$branch_name" = "z$headref" ||
46 ! git config "branch.$branch_name.description" >/dev/null
47 then
48 branch_name=
52 tag_name=$(git describe --exact "$head^0" 2>/dev/null)
54 test -n "$base" && test -n "$url" || usage
56 baserev=$(git rev-parse --verify --quiet "$base"^0)
57 if test -z "$baserev"
58 then
59 die "fatal: Not a valid revision: $base"
62 headrev=$(git rev-parse --verify --quiet "$head"^0)
63 if test -z "$headrev"
64 then
65 die "fatal: Not a valid revision: $head"
68 merge_base=$(git merge-base $baserev $headrev) ||
69 die "fatal: No commits in common between $base and $head"
71 # $head is the token given from the command line, and $tag_name, if
72 # exists, is the tag we are going to show the commit information for.
73 # If that tag exists at the remote and it points at the commit, use it.
74 # Otherwise, if a branch with the same name as $head exists at the remote
75 # and their values match, use that instead.
77 # Otherwise find a random ref that matches $headrev.
78 find_matching_ref='
79 sub abbr {
80 my $ref = shift;
81 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
82 return $ref;
83 } else {
84 return $ref;
88 my ($tagged, $branch, $found);
89 while (<STDIN>) {
90 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
91 next unless ($sha1 eq $ARGV[1]);
92 $found = abbr($ref);
93 if ($deref && $ref eq "tags/$ARGV[2]") {
94 $tagged = $found;
95 last;
97 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
98 $exact = $found;
101 if ($tagged) {
102 print "$tagged\n";
103 } elsif ($exact) {
104 print "$exact\n";
105 } elsif ($found) {
106 print "$found\n";
110 ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
112 url=$(git ls-remote --get-url "$url")
114 git show -s --format='The following changes since commit %H:
116 %s (%ci)
118 are available in the git repository at:
119 ' $merge_base &&
120 echo " $url${ref+ $ref}" &&
121 git show -s --format='
122 for you to fetch changes up to %H:
124 %s (%ci)
126 ----------------------------------------------------------------' $headrev &&
128 if test -n "$branch_name"
129 then
130 echo "(from the branch description for $branch_name local branch)"
131 echo
132 git config "branch.$branch_name.description"
133 fi &&
135 if test -n "$tag_name"
136 then
137 if test -z "$ref" || test "$ref" != "tags/$tag_name"
138 then
139 echo >&2 "warn: You locally have $tag_name but it does not (yet)"
140 echo >&2 "warn: appear to be at $url"
141 echo >&2 "warn: Do you want to push it there, perhaps?"
143 git cat-file tag "$tag_name" |
144 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
145 echo
146 fi &&
148 if test -n "$branch_name" || test -n "$tag_name"
149 then
150 echo "----------------------------------------------------------------"
151 fi &&
153 git shortlog ^$baserev $headrev &&
154 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
156 if test -z "$ref"
157 then
158 echo "warn: No branch of $url is at:" >&2
159 git show -s --format='warn: %h: %s' $headrev >&2
160 echo "warn: Are you sure you pushed '$head' there?" >&2
161 status=1
163 exit $status