diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-29 15:08:05 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-25 12:53:40 -0800 |
commit | 4b14ec878a206e87520378b9e1e43aef469bc646 (patch) | |
tree | e9584c717e1dc3644e3f91f5b600da28b476b2fd | |
parent | request-pull: allow "local:remote" to specify names on both ends (diff) | |
download | tgif-4b14ec878a206e87520378b9e1e43aef469bc646.tar.xz |
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>
-rwxr-xr-x | git-request-pull.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index c8ab0e9120..93b41357ab 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -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)" |