]> git.ipfire.org Git - thirdparty/git.git/blob - git-request-pull.sh
git-submodule.sh: shorten submodule SHA-1s using rev-parse
[thirdparty/git.git] / git-request-pull.sh
1 #!/bin/sh
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
7 SUBDIRECTORY_OK='Yes'
8 OPTIONS_KEEPDASHDASH=
9 OPTIONS_STUCKLONG=
10 OPTIONS_SPEC='git request-pull [options] start url [end]
11 --
12 p show patch text as well
13 '
14
15 . git-sh-setup
16
17 GIT_PAGER=
18 export GIT_PAGER
19
20 patch=
21 while case "$#" in 0) break ;; esac
22 do
23 case "$1" in
24 -p)
25 patch=-p ;;
26 --)
27 shift; break ;;
28 -*)
29 usage ;;
30 *)
31 break ;;
32 esac
33 shift
34 done
35
36 base=$1 url=$2 status=0
37
38 test -n "$base" && test -n "$url" || usage
39
40 baserev=$(git rev-parse --verify --quiet "$base"^0)
41 if test -z "$baserev"
42 then
43 die "fatal: Not a valid revision: $base"
44 fi
45
46 #
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'.
50 #
51 local=${3%:*}
52 local=${local:-HEAD}
53 remote=${3#*:}
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")}
59
60 # None of the above? Bad.
61 test -z "$head" && die "fatal: Not a valid revision: $local"
62
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"
67
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
72 then
73 branch_name=
74 fi
75
76 merge_base=$(git merge-base $baserev $headrev) ||
77 die "fatal: No commits in common between $base and $head"
78
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.
82 #
83 # Otherwise find a random ref that matches $headrev.
84 find_matching_ref='
85 my ($head,$headrev) = (@ARGV);
86 my ($found);
87
88 while (<STDIN>) {
89 chomp;
90 my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
91 my ($pattern);
92 next unless ($sha1 eq $headrev);
93
94 $pattern="/$head\$";
95 if ($ref eq $head) {
96 $found = $ref;
97 }
98 if ($ref =~ /$pattern/) {
99 $found = $ref;
100 }
101 if ($sha1 eq $head) {
102 $found = $sha1;
103 }
104 }
105 if ($found) {
106 print "$found\n";
107 }
108 '
109
110 ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
111
112 if test -z "$ref"
113 then
114 echo "warn: No match for commit $headrev found at $url" >&2
115 echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2
116 status=1
117 fi
118
119 # Special case: turn "for_linus" to "tags/for_linus" when it is correct
120 if test "$ref" = "refs/tags/$pretty_remote"
121 then
122 pretty_remote=tags/$pretty_remote
123 fi
124
125 url=$(git ls-remote --get-url "$url")
126
127 git show -s --format='The following changes since commit %H:
128
129 %s (%ci)
130
131 are available in the Git repository at:
132 ' $merge_base &&
133 echo " $url $pretty_remote" &&
134 git show -s --format='
135 for you to fetch changes up to %H:
136
137 %s (%ci)
138
139 ----------------------------------------------------------------' $headrev &&
140
141 if test $(git cat-file -t "$head") = tag
142 then
143 git cat-file tag "$head" |
144 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
145 echo
146 echo "----------------------------------------------------------------"
147 fi &&
148
149 if test -n "$branch_name"
150 then
151 echo "(from the branch description for $branch_name local branch)"
152 echo
153 git config "branch.$branch_name.description"
154 echo "----------------------------------------------------------------"
155 fi &&
156
157 git shortlog ^$baserev $headrev &&
158 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
159
160 exit $status