]>
Commit | Line | Data |
---|---|---|
ab421d2c RA |
1 | #!/bin/sh -e |
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' |
8f321a39 | 11 | OPTIONS_SPEC= |
806f36d4 | 12 | . git-sh-setup |
ff06c743 | 13 | . git-parse-remote |
ab421d2c | 14 | |
653a31c1 MM |
15 | GIT_PAGER= |
16 | export GIT_PAGER | |
17 | ||
ff06c743 | 18 | base=$1 |
9969b649 JH |
19 | url=$2 |
20 | head=${3-HEAD} | |
ab421d2c | 21 | |
ff06c743 | 22 | [ "$base" ] || usage |
ab421d2c RA |
23 | [ "$url" ] || usage |
24 | ||
5be60078 JH |
25 | baserev=`git rev-parse --verify "$base"^0` && |
26 | headrev=`git rev-parse --verify "$head"^0` || exit | |
ab421d2c | 27 | |
ff06c743 SP |
28 | merge_base=`git merge-base $baserev $headrev` || |
29 | die "fatal: No commits in common between $base and $head" | |
30 | ||
b5e960b1 | 31 | url=$(get_remote_url "$url") |
74982056 | 32 | branch=$(git ls-remote "$url" \ |
ff06c743 SP |
33 | | sed -n -e "/^$headrev refs.heads./{ |
34 | s/^.* refs.heads.// | |
35 | p | |
36 | q | |
b5e960b1 | 37 | }") |
ff06c743 SP |
38 | if [ -z "$branch" ]; then |
39 | echo "warn: No branch of $url is at:" >&2 | |
653a31c1 | 40 | git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2 |
ff06c743 SP |
41 | echo "warn: Are you sure you pushed $head there?" >&2 |
42 | echo >&2 | |
43 | echo >&2 | |
44 | branch=..BRANCH.NOT.VERIFIED.. | |
45 | status=1 | |
46 | fi | |
47 | ||
9969b649 | 48 | echo "The following changes since commit $baserev:" |
ff06c743 | 49 | git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/ \1/' |
ab421d2c | 50 | |
ff06c743 | 51 | echo "are available in the git repository at:" |
9969b649 | 52 | echo |
ff06c743 | 53 | echo " $url $branch" |
9969b649 | 54 | echo |
ab421d2c | 55 | |
ff06c743 SP |
56 | git shortlog ^$baserev $headrev |
57 | git diff -M --stat --summary $merge_base $headrev | |
58 | exit $status |