Browse Source

request-pull: pick up tag message as before

The previous two steps were meant to stop updating the explicit
refname the user gave to the command to a different ref that points
at it.  Most notably, we no longer substitute a branch name the user
used with a name of the tag that points at the commit at the tip of
the branch (it still can be done with "local-branch:remote-tag").

However, they also lost the code that included the message in a
tag when the user _did_ ask the tag to be pulled.  Resurrect it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 11 years ago
parent
commit
4b14ec878a
  1. 8
      git-request-pull.sh

8
git-request-pull.sh

@ -132,6 +132,14 @@ for you to fetch changes up to %H: @@ -132,6 +132,14 @@ for you to fetch changes up to %H:

----------------------------------------------------------------' $headrev &&

if test $(git cat-file -t "$head") = tag
then
git cat-file tag "$head" |
sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
echo
echo "----------------------------------------------------------------"
fi &&

if test -n "$branch_name"
then
echo "(from the branch description for $branch_name local branch)"

Loading…
Cancel
Save