]>
Commit | Line | Data |
---|---|---|
53dfac44 | 1 | #!/bin/sh |
ab421d2c RA |
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 | ||
3eb91bfc SN |
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.' | |
806f36d4 | 10 | SUBDIRECTORY_OK='Yes' |
50ab6558 | 11 | OPTIONS_KEEPDASHDASH= |
133cfaeb JH |
12 | OPTIONS_SPEC='git request-pull [options] start url [end] |
13 | -- | |
14 | p show patch text as well | |
15 | ' | |
16 | ||
806f36d4 | 17 | . git-sh-setup |
ab421d2c | 18 | |
653a31c1 MM |
19 | GIT_PAGER= |
20 | export GIT_PAGER | |
21 | ||
133cfaeb JH |
22 | patch= |
23 | while case "$#" in 0) break ;; esac | |
24 | do | |
25 | case "$1" in | |
26 | -p) | |
27 | patch=-p ;; | |
28 | --) | |
29 | shift; break ;; | |
30 | -*) | |
31 | usage ;; | |
32 | *) | |
33 | break ;; | |
34 | esac | |
35 | shift | |
36 | done | |
37 | ||
c0168147 JH |
38 | base=$1 url=$2 head=${3-HEAD} status=0 branch_name= |
39 | ||
40 | headref=$(git symbolic-ref -q "$head") | |
41 | if git show-ref -q --verify "$headref" | |
42 | then | |
43 | branch_name=${headref#refs/heads/} | |
44 | if test "z$branch_name" = "z$headref" || | |
45 | ! git config "branch.$branch_name.description" >/dev/null | |
46 | then | |
47 | branch_name= | |
48 | fi | |
49 | fi | |
ab421d2c | 50 | |
d0504645 JH |
51 | tag_name=$(git describe --exact "$head^0" 2>/dev/null) |
52 | ||
3c9f1e7c JH |
53 | test -n "$base" && test -n "$url" || usage |
54 | baserev=$(git rev-parse --verify "$base"^0) && | |
55 | headrev=$(git rev-parse --verify "$head"^0) || exit | |
ab421d2c | 56 | |
3c9f1e7c | 57 | merge_base=$(git merge-base $baserev $headrev) || |
ff06c743 SP |
58 | die "fatal: No commits in common between $base and $head" |
59 | ||
fe46fa9d JH |
60 | # $head is the token given from the command line. If a ref with that |
61 | # name exists at the remote and their values match, we should use it. | |
62 | # Otherwise find a ref that matches $headrev. | |
63 | find_matching_ref=' | |
64 | sub abbr { | |
65 | my $ref = shift; | |
f032d66d | 66 | if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) { |
fe46fa9d | 67 | return $ref; |
fe46fa9d JH |
68 | } else { |
69 | return $ref; | |
70 | } | |
71 | } | |
72 | ||
73 | my ($exact, $found); | |
74 | while (<STDIN>) { | |
75 | my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/; | |
76 | next unless ($sha1 eq $ARGV[1]); | |
77 | $found = abbr($ref); | |
78 | if ($ref =~ m|/\Q$ARGV[0]\E$|) { | |
79 | $exact = $found; | |
80 | last; | |
81 | } | |
82 | } | |
83 | if ($exact) { | |
84 | print "$exact\n"; | |
85 | } elsif ($found) { | |
86 | print "$found\n"; | |
87 | } | |
88 | ' | |
89 | ||
90 | ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev") | |
91 | ||
1a927775 | 92 | url=$(git ls-remote --get-url "$url") |
ff06c743 | 93 | |
10eb0007 | 94 | git show -s --format='The following changes since commit %H: |
ab421d2c | 95 | |
10eb0007 MV |
96 | %s (%ci) |
97 | ||
cf731666 JH |
98 | are available in the git repository at: |
99 | ' $baserev && | |
fe46fa9d | 100 | echo " $url${ref+ $ref}" && |
cf731666 JH |
101 | git show -s --format=' |
102 | for you to fetch changes up to %H: | |
103 | ||
104 | %s (%ci) | |
105 | ||
106 | ----------------------------------------------------------------' $headrev && | |
ab421d2c | 107 | |
c0168147 JH |
108 | if test -n "$branch_name" |
109 | then | |
fe46fa9d | 110 | echo "(from the branch description for $branch_name local branch)" |
c0168147 JH |
111 | echo |
112 | git config "branch.$branch_name.description" | |
d0504645 JH |
113 | fi && |
114 | ||
115 | if test -n "$tag_name" | |
116 | then | |
117 | git cat-file tag "$tag_name" | | |
118 | sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p | |
119 | echo | |
120 | fi && | |
121 | ||
122 | if test -n "$branch_name" || test -n "$tag_name" | |
123 | then | |
c0168147 JH |
124 | echo "----------------------------------------------------------------" |
125 | fi && | |
d0504645 | 126 | |
53dfac44 | 127 | git shortlog ^$baserev $headrev && |
cf731666 JH |
128 | git diff -M --stat --summary $patch $merge_base..$headrev || status=1 |
129 | ||
fe46fa9d | 130 | if test -z "$ref" |
cf731666 JH |
131 | then |
132 | echo "warn: No branch of $url is at:" >&2 | |
133 | git show -s --format='warn: %h: %s' $headrev >&2 | |
134 | echo "warn: Are you sure you pushed '$head' there?" >&2 | |
135 | status=1 | |
136 | fi | |
ff06c743 | 137 | exit $status |