]>
git.ipfire.org Git - thirdparty/git.git/blob - git-request-pull.sh
2 # Copyright 2005, Ryan Anderson <ryan@michonline.com>
4 # This file is licensed under the GPL v2, or a later version
5 # at the discretion of Linus Torvalds.
7 USAGE
='<start> <url> [<end>]'
8 LONG_USAGE
='Summarizes the changes between two commits to the standard output,
9 and includes the given URL in the generated summary.'
12 OPTIONS_SPEC
='git request-pull [options] start url [end]
14 p show patch text as well
23 while case "$#" in 0) break ;; esac
38 base
=$1 url
=$2 head=${3-HEAD} status
=0 branch_name
=
40 headref
=$
(git symbolic-ref
-q "$head")
41 if git show-ref
-q --verify "$headref"
43 branch_name
=${headref#refs/heads/}
44 if test "z$branch_name" = "z$headref" ||
45 ! git config
"branch.$branch_name.description" >/dev
/null
51 tag_name
=$
(git describe
--exact "$head^0" 2>/dev
/null
)
53 test -n "$base" && test -n "$url" || usage
55 baserev
=$
(git rev-parse
--verify --quiet "$base"^
0)
58 die
"fatal: Not a valid revision: $base"
61 headrev
=$
(git rev-parse
--verify --quiet "$head"^
0)
64 die
"fatal: Not a valid revision: $head"
67 merge_base
=$
(git merge-base
$baserev $headrev) ||
68 die
"fatal: No commits in common between $base and $head"
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.
76 # Otherwise find a random ref that matches $headrev.
80 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
87 my ($tagged, $branch, $found);
89 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
90 next unless ($sha1 eq $ARGV[1]);
92 if ($deref && $ref eq "tags/$ARGV[2]") {
96 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
109 ref
=$
(git ls-remote
"$url" | @@PERL@@
-e "$find_matching_ref" "$head" "$headrev" "$tag_name")
111 url
=$
(git ls-remote
--get-url "$url")
113 git show
-s --format='The following changes since commit %H:
117 are available in the git repository at:
119 echo " $url${ref+ $ref}" &&
120 git show
-s --format='
121 for you to fetch changes up to %H:
125 ----------------------------------------------------------------' $headrev &&
127 if test -n "$branch_name"
129 echo "(from the branch description for $branch_name local branch)"
131 git config
"branch.$branch_name.description"
134 if test -n "$tag_name"
136 if test -z "$ref" ||
test "$ref" != "tags/$tag_name"
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?"
142 git cat-file tag
"$tag_name" |
143 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
147 if test -n "$branch_name" ||
test -n "$tag_name"
149 echo "----------------------------------------------------------------"
152 git shortlog ^
$baserev $headrev &&
153 git
diff -M --stat --summary $patch $merge_base..
$headrev || status
=1
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