Makefile: Fix compilation of Windows resource file
[git/git.git] / git-request-pull.sh
CommitLineData
53dfac44 1#!/bin/sh
ab421d2c
RA
2# Copyright 2005, Ryan Anderson <ryan@michonline.com>
3#
4# This file is licensed under the GPL v2, or a later version
5# at the discretion of Linus Torvalds.
6
3eb91bfc
SN
7USAGE='<start> <url> [<end>]'
8LONG_USAGE='Summarizes the changes between two commits to the standard output,
9and includes the given URL in the generated summary.'
806f36d4 10SUBDIRECTORY_OK='Yes'
50ab6558 11OPTIONS_KEEPDASHDASH=
133cfaeb
JH
12OPTIONS_SPEC='git request-pull [options] start url [end]
13--
14p show patch text as well
15'
16
806f36d4 17. git-sh-setup
ab421d2c 18
653a31c1
MM
19GIT_PAGER=
20export GIT_PAGER
21
133cfaeb
JH
22patch=
23while case "$#" in 0) break ;; esac
24do
25 case "$1" in
26 -p)
27 patch=-p ;;
28 --)
29 shift; break ;;
30 -*)
31 usage ;;
32 *)
33 break ;;
34 esac
35 shift
36done
37
c0168147
JH
38base=$1 url=$2 head=${3-HEAD} status=0 branch_name=
39
40headref=$(git symbolic-ref -q "$head")
41if git show-ref -q --verify "$headref"
42then
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=
48 fi
49fi
ab421d2c 50
d0504645
JH
51tag_name=$(git describe --exact "$head^0" 2>/dev/null)
52
3c9f1e7c 53test -n "$base" && test -n "$url" || usage
ace33bf9
DW
54
55baserev=$(git rev-parse --verify --quiet "$base"^0)
56if test -z "$baserev"
57then
58 die "fatal: Not a valid revision: $base"
59fi
60
61headrev=$(git rev-parse --verify --quiet "$head"^0)
62if test -z "$headrev"
63then
64 die "fatal: Not a valid revision: $head"
65fi
ab421d2c 66
3c9f1e7c 67merge_base=$(git merge-base $baserev $headrev) ||
ff06c743
SP
68die "fatal: No commits in common between $base and $head"
69
682853e6
JH
70# $head is the token given from the command line, and $tag_name, if
71# exists, is the tag we are going to show the commit information for.
72# If that tag exists at the remote and it points at the commit, use it.
73# Otherwise, if a branch with the same name as $head exists at the remote
74# and their values match, use that instead.
75#
76# Otherwise find a random ref that matches $headrev.
fe46fa9d
JH
77find_matching_ref='
78 sub abbr {
79 my $ref = shift;
2ad9ba03 80 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
fe46fa9d 81 return $ref;
fe46fa9d
JH
82 } else {
83 return $ref;
84 }
85 }
86
682853e6 87 my ($tagged, $branch, $found);
fe46fa9d
JH
88 while (<STDIN>) {
89 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
90 next unless ($sha1 eq $ARGV[1]);
91 $found = abbr($ref);
682853e6
JH
92 if ($deref && $ref eq "tags/$ARGV[2]") {
93 $tagged = $found;
94 last;
95 }
fe46fa9d
JH
96 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
97 $exact = $found;
fe46fa9d
JH
98 }
99 }
682853e6
JH
100 if ($tagged) {
101 print "$tagged\n";
102 } elsif ($exact) {
fe46fa9d
JH
103 print "$exact\n";
104 } elsif ($found) {
105 print "$found\n";
106 }
107'
108
fcb06a8d 109ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
fe46fa9d 110
1a927775 111url=$(git ls-remote --get-url "$url")
ff06c743 112
10eb0007 113git show -s --format='The following changes since commit %H:
ab421d2c 114
10eb0007
MV
115 %s (%ci)
116
cf731666 117are available in the git repository at:
b7e642ec 118' $merge_base &&
fe46fa9d 119echo " $url${ref+ $ref}" &&
cf731666
JH
120git show -s --format='
121for you to fetch changes up to %H:
122
123 %s (%ci)
124
125----------------------------------------------------------------' $headrev &&
ab421d2c 126
c0168147
JH
127if test -n "$branch_name"
128then
fe46fa9d 129 echo "(from the branch description for $branch_name local branch)"
c0168147
JH
130 echo
131 git config "branch.$branch_name.description"
d0504645
JH
132fi &&
133
134if test -n "$tag_name"
135then
682853e6
JH
136 if test -z "$ref" || test "$ref" != "tags/$tag_name"
137 then
138 echo >&2 "warn: You locally have $tag_name but it does not (yet)"
139 echo >&2 "warn: appear to be at $url"
140 echo >&2 "warn: Do you want to push it there, perhaps?"
141 fi
d0504645
JH
142 git cat-file tag "$tag_name" |
143 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
144 echo
145fi &&
146
147if test -n "$branch_name" || test -n "$tag_name"
148then
c0168147
JH
149 echo "----------------------------------------------------------------"
150fi &&
d0504645 151
53dfac44 152git shortlog ^$baserev $headrev &&
cf731666
JH
153git diff -M --stat --summary $patch $merge_base..$headrev || status=1
154
fe46fa9d 155if test -z "$ref"
cf731666
JH
156then
157 echo "warn: No branch of $url is at:" >&2
158 git show -s --format='warn: %h: %s' $headrev >&2
159 echo "warn: Are you sure you pushed '$head' there?" >&2
160 status=1
161fi
ff06c743 162exit $status