From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Jan 2012 05:45:52 +0000 (-0800)
Subject: request-pull: use the real fork point when preparing the message
X-Git-Tag: v1.7.9-rc1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7e642ecec4347b170d206c84850ae0a46b5f46e;p=git.git

request-pull: use the real fork point when preparing the message

The command takes the "start" argument and computes the merge base
between it and the commit to be pulled so that we can show the diffstat,
but uses the "start" argument as-is when composing the message

    The following changes since commit $X are available

to tell the integrator which commit the work is based on. Giving "origin"
(most of the time it resolves to refs/remotes/origin/master) as the start
argument is often convenient, but it is usually not the fork point, and
does not help the integrator at all.

Use the real fork point, which is the merge base we already compute, when
composing that part of the message.

Suggested-by: Linus Torvalds
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-request-pull.sh b/git-request-pull.sh
index d7ba1178a..64960d65a 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -96,7 +96,7 @@ git show -s --format='The following changes since commit %H:
   %s (%ci)
 
 are available in the git repository at:
-' $baserev &&
+' $merge_base &&
 echo "  $url${ref+ $ref}" &&
 git show -s --format='
 for you to fetch changes up to %H: