summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-10 21:45:52 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-10 21:51:15 -0800
commitb7e642ecec4347b170d206c84850ae0a46b5f46e (patch)
tree068eeecf10edf5b742d1c352c84d527d54690682
parentf032d66ddb0cc81807be14c6a9052367df6d1cbc (diff)
downloadgit-b7e642ecec4347b170d206c84850ae0a46b5f46e.tar.gz
request-pull: use the real fork point when preparing the messagejc/request-pull-show-head-4
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>
-rwxr-xr-xgit-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index d7ba1178ae..64960d65a1 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: