]>
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.
10 OPTIONS_SPEC
='git request-pull [options] start url [end]
12 p show patch text as well
21 while case "$#" in 0) break ;; esac
36 base
=$1 url
=$2 status
=0
38 test -n "$base" && test -n "$url" || usage
40 baserev
=$
(git rev-parse
--verify --quiet "$base"^
0)
43 die
"fatal: Not a valid revision: $base"
47 # $3 must be a symbolic ref, a unique ref, or
48 # a SHA object expression. It can also be of
49 # the format 'local-name:remote-name'.
54 pretty_remote
=${remote#refs/}
55 pretty_remote
=${pretty_remote#heads/}
56 head=$
(git symbolic-ref
-q "$local")
57 head=${head:-$(git show-ref --heads --tags "$local" | cut -d' ' -f2)}
58 head=${head:-$(git rev-parse --quiet --verify "$local")}
60 # None of the above? Bad.
61 test -z "$head" && die
"fatal: Not a valid revision: $local"
63 # This also verifies that the resulting head is unique:
64 # "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"
68 # Was it a branch with a description?
69 branch_name
=${head#refs/heads/}
70 if test "z$branch_name" = "z$headref" ||
71 ! git config
"branch.$branch_name.description" >/dev
/null
76 merge_base
=$
(git merge-base
$baserev $headrev) ||
77 die
"fatal: No commits in common between $base and $head"
79 # $head is the refname from the command line.
80 # If a ref with the same name as $head exists at the remote
81 # and their values match, use that.
83 # Otherwise find a random ref that matches $headrev.
85 my ($head,$headrev) = (@ARGV);
90 my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
92 next unless ($sha1 eq $headrev);
98 if ($ref =~ /$pattern/) {
101 if ($sha1 eq $head) {
110 ref
=$
(git ls-remote
"$url" | @@PERL@@
-e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
114 echo "warn: No match for commit $headrev found at $url" >&2
115 echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2
119 # Special case: turn "for_linus" to "tags/for_linus" when it is correct
120 if test "$ref" = "refs/tags/$pretty_remote"
122 pretty_remote
=tags
/$pretty_remote
125 url
=$
(git ls-remote
--get-url "$url")
127 git show
-s --format='The following changes since commit %H:
131 are available in the Git repository at:
133 echo " $url $pretty_remote" &&
134 git show
-s --format='
135 for you to fetch changes up to %H:
139 ----------------------------------------------------------------' $headrev &&
141 if test $
(git cat-file
-t "$head") = tag
143 git cat-file tag
"$head" |
144 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
146 echo "----------------------------------------------------------------"
149 if test -n "$branch_name"
151 echo "(from the branch description for $branch_name local branch)"
153 git config
"branch.$branch_name.description"
154 echo "----------------------------------------------------------------"
157 git shortlog ^
$baserev $headrev &&
158 git
diff -M --stat --summary $patch $merge_base..
$headrev || status
=1