]>
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 | ||
3c9f1e7c | 38 | base=$1 url=$2 head=${3-HEAD} |
ab421d2c | 39 | |
3c9f1e7c JH |
40 | test -n "$base" && test -n "$url" || usage |
41 | baserev=$(git rev-parse --verify "$base"^0) && | |
42 | headrev=$(git rev-parse --verify "$head"^0) || exit | |
ab421d2c | 43 | |
3c9f1e7c | 44 | merge_base=$(git merge-base $baserev $headrev) || |
ff06c743 SP |
45 | die "fatal: No commits in common between $base and $head" |
46 | ||
3c9f1e7c JH |
47 | find_matching_branch="/^$headrev "'refs\/heads\//{ |
48 | s/^.* refs\/heads\/// | |
49 | p | |
50 | q | |
51 | }' | |
52 | branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch") | |
1a927775 | 53 | url=$(git ls-remote --get-url "$url") |
3c9f1e7c JH |
54 | if test -z "$branch" |
55 | then | |
ff06c743 | 56 | echo "warn: No branch of $url is at:" >&2 |
653a31c1 | 57 | git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2 |
ff06c743 SP |
58 | echo "warn: Are you sure you pushed $head there?" >&2 |
59 | echo >&2 | |
60 | echo >&2 | |
61 | branch=..BRANCH.NOT.VERIFIED.. | |
62 | status=1 | |
63 | fi | |
64 | ||
10eb0007 | 65 | git show -s --format='The following changes since commit %H: |
ab421d2c | 66 | |
10eb0007 MV |
67 | %s (%ci) |
68 | ||
53dfac44 BC |
69 | are available in the git repository at:' $baserev && |
70 | echo " $url $branch" && | |
71 | echo && | |
ab421d2c | 72 | |
53dfac44 BC |
73 | git shortlog ^$baserev $headrev && |
74 | git diff -M --stat --summary $patch $merge_base..$headrev || exit | |
ff06c743 | 75 | exit $status |