]>
Commit | Line | Data |
---|---|---|
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 | 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.' | |
10 | SUBDIRECTORY_OK='Yes' | |
11 | OPTIONS_KEEPDASHDASH= | |
12 | OPTIONS_SPEC='git request-pull [options] start url [end] | |
13 | -- | |
14 | p show patch text as well | |
15 | ' | |
16 | ||
17 | . git-sh-setup | |
18 | . git-parse-remote | |
19 | ||
20 | GIT_PAGER= | |
21 | export GIT_PAGER | |
22 | ||
23 | patch= | |
24 | while case "$#" in 0) break ;; esac | |
25 | do | |
26 | case "$1" in | |
27 | -p) | |
28 | patch=-p ;; | |
29 | --) | |
30 | shift; break ;; | |
31 | -*) | |
32 | usage ;; | |
33 | *) | |
34 | break ;; | |
35 | esac | |
36 | shift | |
37 | done | |
38 | ||
39 | base=$1 | |
40 | url=$2 | |
41 | head=${3-HEAD} | |
42 | ||
43 | [ "$base" ] || usage | |
44 | [ "$url" ] || usage | |
45 | ||
46 | baserev=`git rev-parse --verify "$base"^0` && | |
47 | headrev=`git rev-parse --verify "$head"^0` || exit | |
48 | ||
49 | merge_base=`git merge-base $baserev $headrev` || | |
50 | die "fatal: No commits in common between $base and $head" | |
51 | ||
52 | branch=$(git ls-remote "$url" \ | |
53 | | sed -n -e "/^$headrev refs.heads./{ | |
54 | s/^.* refs.heads.// | |
55 | p | |
56 | q | |
57 | }") | |
58 | url=$(get_remote_url "$url") | |
59 | if [ -z "$branch" ]; then | |
60 | echo "warn: No branch of $url is at:" >&2 | |
61 | git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2 | |
62 | echo "warn: Are you sure you pushed $head there?" >&2 | |
63 | echo >&2 | |
64 | echo >&2 | |
65 | branch=..BRANCH.NOT.VERIFIED.. | |
66 | status=1 | |
67 | fi | |
68 | ||
69 | git show -s --format='The following changes since commit %H: | |
70 | ||
71 | %s (%ci) | |
72 | ||
73 | are available in the git repository at:' $baserev && | |
74 | echo " $url $branch" && | |
75 | echo && | |
76 | ||
77 | git shortlog ^$baserev $headrev && | |
78 | git diff -M --stat --summary $patch $merge_base..$headrev || exit | |
79 | exit $status |