2005-07-26 09:30:36 +02:00
|
|
|
#!/bin/sh -e
|
|
|
|
# Copyright 2005, Ryan Anderson <ryan@michonline.com>
|
|
|
|
#
|
|
|
|
# This file is licensed under the GPL v2, or a later version
|
|
|
|
# at the discretion of Linus Torvalds.
|
|
|
|
|
2008-11-17 09:57:19 +01:00
|
|
|
USAGE='<start> <url> [<end>]'
|
|
|
|
LONG_USAGE='Summarizes the changes between two commits to the standard output,
|
|
|
|
and includes the given URL in the generated summary.'
|
2005-12-13 23:30:31 +01:00
|
|
|
SUBDIRECTORY_OK='Yes'
|
2010-04-24 14:15:37 +02:00
|
|
|
OPTIONS_KEEPDASHDASH=
|
2009-07-27 23:27:47 +02:00
|
|
|
OPTIONS_SPEC='git request-pull [options] start url [end]
|
|
|
|
--
|
|
|
|
p show patch text as well
|
|
|
|
'
|
|
|
|
|
2005-12-13 23:30:31 +01:00
|
|
|
. git-sh-setup
|
2007-05-01 08:08:23 +02:00
|
|
|
. git-parse-remote
|
2005-07-26 09:30:36 +02:00
|
|
|
|
2009-07-01 11:40:30 +02:00
|
|
|
GIT_PAGER=
|
|
|
|
export GIT_PAGER
|
|
|
|
|
2009-07-27 23:27:47 +02:00
|
|
|
patch=
|
|
|
|
while case "$#" in 0) break ;; esac
|
|
|
|
do
|
|
|
|
case "$1" in
|
|
|
|
-p)
|
|
|
|
patch=-p ;;
|
|
|
|
--)
|
|
|
|
shift; break ;;
|
|
|
|
-*)
|
|
|
|
usage ;;
|
|
|
|
*)
|
|
|
|
break ;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
2007-05-01 08:08:23 +02:00
|
|
|
base=$1
|
2005-07-26 20:47:31 +02:00
|
|
|
url=$2
|
|
|
|
head=${3-HEAD}
|
2005-07-26 09:30:36 +02:00
|
|
|
|
2007-05-01 08:08:23 +02:00
|
|
|
[ "$base" ] || usage
|
2005-07-26 09:30:36 +02:00
|
|
|
[ "$url" ] || usage
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
baserev=`git rev-parse --verify "$base"^0` &&
|
|
|
|
headrev=`git rev-parse --verify "$head"^0` || exit
|
2005-07-26 09:30:36 +02:00
|
|
|
|
2007-05-01 08:08:23 +02:00
|
|
|
merge_base=`git merge-base $baserev $headrev` ||
|
|
|
|
die "fatal: No commits in common between $base and $head"
|
|
|
|
|
2008-07-09 01:32:15 +02:00
|
|
|
branch=$(git ls-remote "$url" \
|
2007-05-01 08:08:23 +02:00
|
|
|
| sed -n -e "/^$headrev refs.heads./{
|
|
|
|
s/^.* refs.heads.//
|
|
|
|
p
|
|
|
|
q
|
2007-11-08 22:47:36 +01:00
|
|
|
}")
|
2009-07-29 03:30:02 +02:00
|
|
|
url=$(get_remote_url "$url")
|
2007-05-01 08:08:23 +02:00
|
|
|
if [ -z "$branch" ]; then
|
|
|
|
echo "warn: No branch of $url is at:" >&2
|
2009-07-01 11:40:30 +02:00
|
|
|
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
|
2007-05-01 08:08:23 +02:00
|
|
|
echo "warn: Are you sure you pushed $head there?" >&2
|
|
|
|
echo >&2
|
|
|
|
echo >&2
|
|
|
|
branch=..BRANCH.NOT.VERIFIED..
|
|
|
|
status=1
|
|
|
|
fi
|
|
|
|
|
2010-01-29 15:17:59 +01:00
|
|
|
git show -s --format='The following changes since commit %H:
|
2005-07-26 09:30:36 +02:00
|
|
|
|
2010-01-29 15:17:59 +01:00
|
|
|
%s (%ci)
|
|
|
|
|
|
|
|
are available in the git repository at:' $baserev
|
2007-05-01 08:08:23 +02:00
|
|
|
echo " $url $branch"
|
2005-07-26 20:47:31 +02:00
|
|
|
echo
|
2005-07-26 09:30:36 +02:00
|
|
|
|
2007-05-01 08:08:23 +02:00
|
|
|
git shortlog ^$baserev $headrev
|
2009-07-27 23:27:47 +02:00
|
|
|
git diff -M --stat --summary $patch $merge_base..$headrev
|
2007-05-01 08:08:23 +02:00
|
|
|
exit $status
|