]> git.ipfire.org Git - thirdparty/git.git/blame - git-request-pull.sh
t7810-*.sh: Remove redundant test
[thirdparty/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
JH
53test -n "$base" && test -n "$url" || usage
54baserev=$(git rev-parse --verify "$base"^0) &&
55headrev=$(git rev-parse --verify "$head"^0) || exit
ab421d2c 56
3c9f1e7c 57merge_base=$(git merge-base $baserev $headrev) ||
ff06c743
SP
58die "fatal: No commits in common between $base and $head"
59
fe46fa9d
JH
60# $head is the token given from the command line. If a ref with that
61# name exists at the remote and their values match, we should use it.
62# Otherwise find a ref that matches $headrev.
63find_matching_ref='
64 sub abbr {
65 my $ref = shift;
2ad9ba03 66 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
fe46fa9d 67 return $ref;
fe46fa9d
JH
68 } else {
69 return $ref;
70 }
71 }
72
73 my ($exact, $found);
74 while (<STDIN>) {
75 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
76 next unless ($sha1 eq $ARGV[1]);
77 $found = abbr($ref);
78 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
79 $exact = $found;
80 last;
81 }
82 }
83 if ($exact) {
84 print "$exact\n";
85 } elsif ($found) {
86 print "$found\n";
87 }
88'
89
90ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev")
91
1a927775 92url=$(git ls-remote --get-url "$url")
ff06c743 93
10eb0007 94git show -s --format='The following changes since commit %H:
ab421d2c 95
10eb0007
MV
96 %s (%ci)
97
cf731666 98are available in the git repository at:
b7e642ec 99' $merge_base &&
fe46fa9d 100echo " $url${ref+ $ref}" &&
cf731666
JH
101git show -s --format='
102for you to fetch changes up to %H:
103
104 %s (%ci)
105
106----------------------------------------------------------------' $headrev &&
ab421d2c 107
c0168147
JH
108if test -n "$branch_name"
109then
fe46fa9d 110 echo "(from the branch description for $branch_name local branch)"
c0168147
JH
111 echo
112 git config "branch.$branch_name.description"
d0504645
JH
113fi &&
114
115if test -n "$tag_name"
116then
117 git cat-file tag "$tag_name" |
118 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
119 echo
120fi &&
121
122if test -n "$branch_name" || test -n "$tag_name"
123then
c0168147
JH
124 echo "----------------------------------------------------------------"
125fi &&
d0504645 126
53dfac44 127git shortlog ^$baserev $headrev &&
cf731666
JH
128git diff -M --stat --summary $patch $merge_base..$headrev || status=1
129
fe46fa9d 130if test -z "$ref"
cf731666
JH
131then
132 echo "warn: No branch of $url is at:" >&2
133 git show -s --format='warn: %h: %s' $headrev >&2
134 echo "warn: Are you sure you pushed '$head' there?" >&2
135 status=1
136fi
ff06c743 137exit $status