Skip to content

Commit

Permalink
request-pull: pick up tag message as before
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Feb 25, 2014
1 parent dc2eacc commit 4b14ec8
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions git-request-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down

0 comments on commit 4b14ec8

Please sign in to comment.