summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-07-27 14:27:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-29 11:02:49 -0700
commit133cfaeb8ba40f12e4c0ad99bdd3a0a4f8d0ade2 (patch)
tree3578b088eef4c26308180ad97586c720848eb575
parentMerge branch 'hv/cvsps-tests' (diff)
downloadtgif-133cfaeb8ba40f12e4c0ad99bdd3a0a4f8d0ade2.tar.xz
request-pull: optionally show a patch as well
Allow git request-pull to append diff body into the pull request. It's useful for small series of commits. Tested-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-request-pull.sh24
1 files changed, 22 insertions, 2 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index fd95beadab..630ceddf03 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -8,13 +8,33 @@ 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.'
SUBDIRECTORY_OK='Yes'
-OPTIONS_SPEC=
+OPTIONS_SPEC='git request-pull [options] start url [end]
+--
+p show patch text as well
+'
+
. git-sh-setup
. git-parse-remote
GIT_PAGER=
export GIT_PAGER
+patch=
+while case "$#" in 0) break ;; esac
+do
+ case "$1" in
+ -p)
+ patch=-p ;;
+ --)
+ shift; break ;;
+ -*)
+ usage ;;
+ *)
+ break ;;
+ esac
+ shift
+done
+
base=$1
url=$2
head=${3-HEAD}
@@ -54,5 +74,5 @@ echo " $url $branch"
echo
git shortlog ^$baserev $headrev
-git diff -M --stat --summary $merge_base $headrev
+git diff -M --stat --summary $patch $merge_base..$headrev
exit $status