]> git.ipfire.org Git - thirdparty/git.git/blame - git-request-pull.sh
l10n: Update Swedish translation (1168t0f0u)
[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
682853e6
JH
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.
65#
66# Otherwise find a random ref that matches $headrev.
fe46fa9d
JH
67find_matching_ref='
68 sub abbr {
69 my $ref = shift;
2ad9ba03 70 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
fe46fa9d 71 return $ref;
fe46fa9d
JH
72 } else {
73 return $ref;
74 }
75 }
76
682853e6 77 my ($tagged, $branch, $found);
fe46fa9d
JH
78 while (<STDIN>) {
79 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
80 next unless ($sha1 eq $ARGV[1]);
81 $found = abbr($ref);
682853e6
JH
82 if ($deref && $ref eq "tags/$ARGV[2]") {
83 $tagged = $found;
84 last;
85 }
fe46fa9d
JH
86 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
87 $exact = $found;
fe46fa9d
JH
88 }
89 }
682853e6
JH
90 if ($tagged) {
91 print "$tagged\n";
92 } elsif ($exact) {
fe46fa9d
JH
93 print "$exact\n";
94 } elsif ($found) {
95 print "$found\n";
96 }
97'
98
682853e6 99ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
fe46fa9d 100
1a927775 101url=$(git ls-remote --get-url "$url")
ff06c743 102
10eb0007 103git show -s --format='The following changes since commit %H:
ab421d2c 104
10eb0007
MV
105 %s (%ci)
106
cf731666 107are available in the git repository at:
b7e642ec 108' $merge_base &&
fe46fa9d 109echo " $url${ref+ $ref}" &&
cf731666
JH
110git show -s --format='
111for you to fetch changes up to %H:
112
113 %s (%ci)
114
115----------------------------------------------------------------' $headrev &&
ab421d2c 116
c0168147
JH
117if test -n "$branch_name"
118then
fe46fa9d 119 echo "(from the branch description for $branch_name local branch)"
c0168147
JH
120 echo
121 git config "branch.$branch_name.description"
d0504645
JH
122fi &&
123
124if test -n "$tag_name"
125then
682853e6
JH
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?"
131 fi
d0504645
JH
132 git cat-file tag "$tag_name" |
133 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
134 echo
135fi &&
136
137if test -n "$branch_name" || test -n "$tag_name"
138then
c0168147
JH
139 echo "----------------------------------------------------------------"
140fi &&
d0504645 141
53dfac44 142git shortlog ^$baserev $headrev &&
cf731666
JH
143git diff -M --stat --summary $patch $merge_base..$headrev || status=1
144
fe46fa9d 145if test -z "$ref"
cf731666
JH
146then
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
151fi
ff06c743 152exit $status