Subject: [PATCH] Improve request-pull to handle non-rebased branches

From: "Shawn O. Pearce" <[email-masked]>
Date: Tue, 24 Apr 2007 12:40:19 -0400

This is actually a few different changes to request-pull,
making it slightly smarter:

 1) Compute the merge-base between the two revisions upfront
    and reuse that selected merge-base for all log and diff
    operations.

 2) Disable the PAGER when running shortlog and diff, as these
    would otherwise activate the pager for each command when
    git-request-pull is run on a tty.  Users can get the entire
    output paged (if desired) using `git -p request-pull`.

 3) Use shortlog rather than `git log | git shortlog` now that
    recent shortlog versions are able to run the revision listing
    internally.

 4) Attempt to resolve the input URL using the user's configured
    remotes.  This is useful if the URL you want the recipient to
    see is also the one you used to push your changes.  If not a
    config-file remote could easily be setup for the public URL
    and request-pull can be passed that instead.

 5) Minor cleanup of revision->base variable names, making it
    follow the head/headrev naming convention that is already
    in use.

Signed-off-by: Shawn O. Pearce <[email-masked]>
---
 git-request-pull.sh |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/git-request-pull.sh b/git-request-pull.sh
index 4eacc3a..367b262 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -9,25 +9,27 @@ LONG_USAGE='Summarizes the changes since <commit> to the standard output,
 and includes <url> in the message generated.'
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
+. git-parse-remote
 
-revision=$1
+base=$1
 url=$2
 head=${3-HEAD}
 
-[ "$revision" ] || usage
+[ "$base" ] || usage
 [ "$url" ] || usage
 
-baserev=`git-rev-parse --verify "$revision"^0` &&
+baserev=`git-merge-base "$base" "$head"` &&
 headrev=`git-rev-parse --verify "$head"^0` || exit
 
+PAGER=
+export PAGER
 echo "The following changes since commit $baserev:"
-git log --max-count=1 --pretty=short "$baserev" |
-git-shortlog | sed -e 's/^\(.\)/  \1/'
+git shortlog --max-count=1 $baserev | sed -e 's/^\(.\)/  \1/'
 
 echo "are found in the git repository at:" 
 echo
-echo "  $url"
+echo "  `get_remote_url "$url"`"
 echo
 
-git log  $baserev..$headrev | git-shortlog ;
-git diff -M --stat --summary $baserev..$headrev
+git shortlog ^$baserev $headrev
+git diff -M --stat --summary $baserev $headrev
-- 
1.5.1.1.135.gf948