git-request-pull.sh 3.61 KB
Newer Older
1
#!/bin/sh
2 3 4 5 6
# Copyright 2005, Ryan Anderson <ryan@michonline.com>
#
# This file is licensed under the GPL v2, or a later version
# at the discretion of Linus Torvalds.

7
SUBDIRECTORY_OK='Yes'
8
OPTIONS_KEEPDASHDASH=
9
OPTIONS_STUCKLONG=
10 11 12 13 14
OPTIONS_SPEC='git request-pull [options] start url [end]
--
p    show patch text as well
'

15
. git-sh-setup
16

17 18 19
GIT_PAGER=
export GIT_PAGER

20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
patch=
while	case "$#" in 0) break ;; esac
do
	case "$1" in
	-p)
		patch=-p ;;
	--)
		shift; break ;;
	-*)
		usage ;;
	*)
		break ;;
	esac
	shift
done

36
base=$1 url=$2 status=0
37

38
test -n "$base" && test -n "$url" || usage
39 40 41 42 43 44 45

baserev=$(git rev-parse --verify --quiet "$base"^0)
if test -z "$baserev"
then
    die "fatal: Not a valid revision: $base"
fi

46 47
#
# $3 must be a symbolic ref, a unique ref, or
48 49
# a SHA object expression. It can also be of
# the format 'local-name:remote-name'.
50
#
51 52 53
local=${3%:*}
local=${local:-HEAD}
remote=${3#*:}
54 55
pretty_remote=${remote#refs/}
pretty_remote=${pretty_remote#heads/}
56 57 58
head=$(git symbolic-ref -q "$local")
head=${head:-$(git show-ref --heads --tags "$local" | cut -d' ' -f2)}
head=${head:-$(git rev-parse --quiet --verify "$local")}
59 60

# None of the above? Bad.
61
test -z "$head" && die "fatal: Not a valid revision: $local"
62 63 64

# This also verifies that the resulting head is unique:
# "git show-ref" could have shown multiple matching refs..
65
headrev=$(git rev-parse --verify --quiet "$head"^0)
66
test -z "$headrev" && die "fatal: Ambiguous revision: $local"
67 68 69 70 71

# Was it a branch with a description?
branch_name=${head#refs/heads/}
if test "z$branch_name" = "z$headref" ||
	! git config "branch.$branch_name.description" >/dev/null
72
then
73
	branch_name=
74
fi
75

76
merge_base=$(git merge-base $baserev $headrev) ||
77 78
die "fatal: No commits in common between $base and $head"

79 80 81
# $head is the refname from the command line.
# If a ref with the same name as $head exists at the remote
# and their values match, use that.
82 83
#
# Otherwise find a random ref that matches $headrev.
84
find_matching_ref='
85 86
	my ($head,$headrev) = (@ARGV);
	my ($found);
87 88

	while (<STDIN>) {
89
		chomp;
90
		my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
91 92 93 94 95 96 97 98 99
		my ($pattern);
		next unless ($sha1 eq $headrev);

		$pattern="/$head\$";
		if ($ref eq $head) {
			$found = $ref;
		}
		if ($ref =~ /$pattern/) {
			$found = $ref;
100
		}
101
		if ($sha1 eq $head) {
102
			$found = $sha1;
103 104
		}
	}
105
	if ($found) {
106 107 108 109
		print "$found\n";
	}
'

110
ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
111 112 113

if test -z "$ref"
then
114 115
	echo "warn: No match for commit $headrev found at $url" >&2
	echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2
116 117
	status=1
fi
118

119 120 121 122 123 124
# Special case: turn "for_linus" to "tags/for_linus" when it is correct
if test "$ref" = "refs/tags/$pretty_remote"
then
	pretty_remote=tags/$pretty_remote
fi

125
url=$(git ls-remote --get-url "$url")
126

127
git show -s --format='The following changes since commit %H:
128

129 130
  %s (%ci)

131
are available in the Git repository at:
132
' $merge_base &&
133
echo "  $url $pretty_remote" &&
134 135 136 137 138 139
git show -s --format='
for you to fetch changes up to %H:

  %s (%ci)

----------------------------------------------------------------' $headrev &&
140

141
if test $(git cat-file -t "$head") = tag
142
then
143
	git cat-file tag "$head" |
144 145
	sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
	echo
146
	echo "----------------------------------------------------------------"
147 148
fi &&

149
if test -n "$branch_name"
150
then
151
	echo "(from the branch description for $branch_name local branch)"
152 153 154 155
	echo
	git config "branch.$branch_name.description"
	echo "----------------------------------------------------------------"
fi &&
156

157
git shortlog ^$baserev $headrev &&
158 159
git diff -M --stat --summary $patch $merge_base..$headrev || status=1

160
exit $status