Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 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 | |
Stefan Naewe | 3eb91bf | 2008-11-17 09:57:19 +0100 | [diff] [blame] | 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.' |
freku045@student.liu.se | 806f36d | 2005-12-13 23:30:31 +0100 | [diff] [blame] | 10 | SUBDIRECTORY_OK='Yes' |
Jonathan Nieder | 50ab655 | 2010-04-24 07:15:37 -0500 | [diff] [blame] | 11 | OPTIONS_KEEPDASHDASH= |
Junio C Hamano | 133cfae | 2009-07-27 14:27:47 -0700 | [diff] [blame] | 12 | OPTIONS_SPEC='git request-pull [options] start url [end] |
| 13 | -- |
| 14 | p show patch text as well |
| 15 | ' |
| 16 | |
freku045@student.liu.se | 806f36d | 2005-12-13 23:30:31 +0100 | [diff] [blame] | 17 | . git-sh-setup |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 18 | . git-parse-remote |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 19 | |
Michal Marek | 653a31c | 2009-07-01 11:40:30 +0200 | [diff] [blame] | 20 | GIT_PAGER= |
| 21 | export GIT_PAGER |
| 22 | |
Junio C Hamano | 133cfae | 2009-07-27 14:27:47 -0700 | [diff] [blame] | 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 | |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 39 | base=$1 |
Junio C Hamano | 9969b64 | 2005-07-26 11:47:31 -0700 | [diff] [blame] | 40 | url=$2 |
| 41 | head=${3-HEAD} |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 42 | |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 43 | [ "$base" ] || usage |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 44 | [ "$url" ] || usage |
| 45 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 46 | baserev=`git rev-parse --verify "$base"^0` && |
| 47 | headrev=`git rev-parse --verify "$head"^0` || exit |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 48 | |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 49 | merge_base=`git merge-base $baserev $headrev` || |
| 50 | die "fatal: No commits in common between $base and $head" |
| 51 | |
Ramsay Jones | 7498205 | 2008-07-09 00:32:15 +0100 | [diff] [blame] | 52 | branch=$(git ls-remote "$url" \ |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 53 | | sed -n -e "/^$headrev refs.heads./{ |
| 54 | s/^.* refs.heads.// |
| 55 | p |
| 56 | q |
Ralf Wildenhues | b5e960b | 2007-11-08 22:47:36 +0100 | [diff] [blame] | 57 | }") |
Tom Grennan | 33016c4 | 2009-07-28 18:30:02 -0700 | [diff] [blame] | 58 | url=$(get_remote_url "$url") |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 59 | if [ -z "$branch" ]; then |
| 60 | echo "warn: No branch of $url is at:" >&2 |
Michal Marek | 653a31c | 2009-07-01 11:40:30 +0200 | [diff] [blame] | 61 | git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2 |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 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 | |
Miklos Vajna | 10eb000 | 2010-01-29 15:17:59 +0100 | [diff] [blame] | 69 | git show -s --format='The following changes since commit %H: |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 70 | |
Miklos Vajna | 10eb000 | 2010-01-29 15:17:59 +0100 | [diff] [blame] | 71 | %s (%ci) |
| 72 | |
| 73 | are available in the git repository at:' $baserev |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 74 | echo " $url $branch" |
Junio C Hamano | 9969b64 | 2005-07-26 11:47:31 -0700 | [diff] [blame] | 75 | echo |
Ryan Anderson | ab421d2 | 2005-07-26 03:30:36 -0400 | [diff] [blame] | 76 | |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 77 | git shortlog ^$baserev $headrev |
Junio C Hamano | 133cfae | 2009-07-27 14:27:47 -0700 | [diff] [blame] | 78 | git diff -M --stat --summary $patch $merge_base..$headrev |
Shawn O. Pearce | ff06c74 | 2007-05-01 02:08:23 -0400 | [diff] [blame] | 79 | exit $status |