git-request-pull.sh 3.56 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 8 9
USAGE='<start> <url> [<end>]'
LONG_USAGE='Summarizes the changes between two commits to the standard output,
and includes the given URL in the generated summary.'
10
SUBDIRECTORY_OK='Yes'
11
OPTIONS_KEEPDASHDASH=
12 13 14 15 16
OPTIONS_SPEC='git request-pull [options] start url [end]
--
p    show patch text as well
'

17
. git-sh-setup
18

19 20 21
GIT_PAGER=
export GIT_PAGER

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

38 39 40 41 42 43 44 45 46 47 48 49
base=$1 url=$2 head=${3-HEAD} status=0 branch_name=

headref=$(git symbolic-ref -q "$head")
if git show-ref -q --verify "$headref"
then
	branch_name=${headref#refs/heads/}
	if test "z$branch_name" = "z$headref" ||
		! git config "branch.$branch_name.description" >/dev/null
	then
		branch_name=
	fi
fi
50

51 52
tag_name=$(git describe --exact "$head^0" 2>/dev/null)

53 54 55
test -n "$base" && test -n "$url" || usage
baserev=$(git rev-parse --verify "$base"^0) &&
headrev=$(git rev-parse --verify "$head"^0) || exit
56

57
merge_base=$(git merge-base $baserev $headrev) ||
58 59
die "fatal: No commits in common between $base and $head"

60 61 62 63 64 65 66
# $head is the token given from the command line, and $tag_name, if
# exists, is the tag we are going to show the commit information for.
# If that tag exists at the remote and it points at the commit, use it.
# Otherwise, if a branch with the same name as $head exists at the remote
# and their values match, use that instead.
#
# Otherwise find a random ref that matches $headrev.
67 68 69
find_matching_ref='
	sub abbr {
		my $ref = shift;
70
		if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
71 72 73 74 75 76
			return $ref;
		} else {
			return $ref;
		}
	}

77
	my ($tagged, $branch, $found);
78 79 80 81
	while (<STDIN>) {
		my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
		next unless ($sha1 eq $ARGV[1]);
		$found = abbr($ref);
82 83 84 85
		if ($deref && $ref eq "tags/$ARGV[2]") {
			$tagged = $found;
			last;
		}
86 87 88 89
		if ($ref =~ m|/\Q$ARGV[0]\E$|) {
			$exact = $found;
		}
	}
90 91 92
	if ($tagged) {
		print "$tagged\n";
	} elsif ($exact) {
93 94 95 96 97 98
		print "$exact\n";
	} elsif ($found) {
		print "$found\n";
	}
'

99
ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
100

101
url=$(git ls-remote --get-url "$url")
102

103
git show -s --format='The following changes since commit %H:
104

105 106
  %s (%ci)

107
are available in the git repository at:
108
' $merge_base &&
109
echo "  $url${ref+ $ref}" &&
110 111 112 113 114 115
git show -s --format='
for you to fetch changes up to %H:

  %s (%ci)

----------------------------------------------------------------' $headrev &&
116

117 118
if test -n "$branch_name"
then
119
	echo "(from the branch description for $branch_name local branch)"
120 121
	echo
	git config "branch.$branch_name.description"
122 123 124 125
fi &&

if test -n "$tag_name"
then
126 127 128 129 130 131
	if test -z "$ref" || test "$ref" != "tags/$tag_name"
	then
		echo >&2 "warn: You locally have $tag_name but it does not (yet)"
		echo >&2 "warn: appear to be at $url"
		echo >&2 "warn: Do you want to push it there, perhaps?"
	fi
132 133 134 135 136 137 138
	git cat-file tag "$tag_name" |
	sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
	echo
fi &&

if test -n "$branch_name" || test -n "$tag_name"
then
139 140
	echo "----------------------------------------------------------------"
fi &&
141

142
git shortlog ^$baserev $headrev &&
143 144
git diff -M --stat --summary $patch $merge_base..$headrev || status=1

145
if test -z "$ref"
146 147 148 149 150 151
then
	echo "warn: No branch of $url is at:" >&2
	git show -s --format='warn:   %h: %s' $headrev >&2
	echo "warn: Are you sure you pushed '$head' there?" >&2
	status=1
fi
152
exit $status