author | Junio C Hamano <gitster@pobox.com> | |
Sat, 5 Nov 2011 04:06:30 +0000 (21:06 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 8 Nov 2011 18:36:18 +0000 (10:36 -0800) | ||
commit | 895680f044ebe9df600e6c9e042d40d9d953bc9b | |
tree | e5103e3faab9bb9eee810db5e35cf7d8d4f3e381 | tree | snapshot |
parent | cbda121c993bf14d3743c7fdf0f8c476c9f7c636 | commit | diff |
fmt-merge-msg: Add contents of merged tag in the merge message
When a contributor asks the integrator to merge her history, a signed tag
can be a good vehicle to communicate the authenticity of the request while
conveying other information such as the purpose of the topic.
E.g. a signed tag "for-linus" can be created, and the integrator can run:
$ git pull git://example.com/work.git/ for-linus
This would allow the integrator to run "git verify-tag FETCH_HEAD" to
validate the signed tag.
Update fmt-merge-msg so that it pre-fills the merge message template with
the body (but not signature) of the tag object to help the integrator write
a better merge message, in the same spirit as the existing merge.log summary
lines.
The message that comes from GPG signature validation is also included in
the merge message template to help the integrator verify it, but they are
prefixed with "#" to make them comments.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When a contributor asks the integrator to merge her history, a signed tag
can be a good vehicle to communicate the authenticity of the request while
conveying other information such as the purpose of the topic.
E.g. a signed tag "for-linus" can be created, and the integrator can run:
$ git pull git://example.com/work.git/ for-linus
This would allow the integrator to run "git verify-tag FETCH_HEAD" to
validate the signed tag.
Update fmt-merge-msg so that it pre-fills the merge message template with
the body (but not signature) of the tag object to help the integrator write
a better merge message, in the same spirit as the existing merge.log summary
lines.
The message that comes from GPG signature validation is also included in
the merge message template to help the integrator verify it, but they are
prefixed with "#" to make them comments.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fmt-merge-msg.c | diff | blob | history | |
strbuf.c | diff | blob | history | |
strbuf.h | diff | blob | history |