This extends on the earlier topic to pull and merge signed tags. So far,
we did record them for later auditing, but did not have an easy way to
perform the auditing, other than manually extracting the information from
the commit object.
Applies on top of the merge between the current 'master' and the
'jc/signed-commit' topic still in 'next', as the latter topic already has
necessary infrastructure to hook into the "log" machinery to show the
signatures embedded in commit objects with the "--show-signature" option.
Help on adding tests, docs and tying loose ends are very much appreciated.
A sample workflow with the command may look like this:
$ git checkout v1.7.8^0
$ git pull $elsewhere v1.7.8.2
$ git show -s --show-signature
commit e00ee29c760ae27c177ec16adb8c94b85909f464
parent #2, tagged 'v1.7.8.2'
gpg: Signature made Wed 28 Dec 2011 12:03:39 PM PST using RSA key ID 96AFE6CB
gpg: Good signature from "Junio C Hamano <gitster@xxxxxxxxx>"
gpg: aka "Junio C Hamano <junio@xxxxxxxxx>"
gpg: aka "Junio C Hamano <jch@xxxxxxxxxx>"
Merge: 406da78 f3f778d
Author: Junio C Hamano <gitster@xxxxxxxxx>
Date: Wed Jan 4 14:05:03 2012 -0800
Merge tag 'v1.7.8.2' of ../git into HEAD
Git 1.7.8.2
$ git commit -S --amend --no-edit
commit df409f0d0b1f3f521dd0fd2baf6ecf01495c0191
gpg: Signature made Wed 04 Jan 2012 02:05:26 PM PST using RSA key ID 96AFE6CB
gpg: Good signature from "Junio C Hamano <gitster@xxxxxxxxx>"
gpg: aka "Junio C Hamano <junio@xxxxxxxxx>"
gpg: aka "Junio C Hamano <jch@xxxxxxxxxx>"
parent #2, tagged 'v1.7.8.2'
gpg: Signature made Wed 28 Dec 2011 12:03:39 PM PST using RSA key ID 96AFE6CB
gpg: Good signature from "Junio C Hamano <gitster@xxxxxxxxx>"
gpg: aka "Junio C Hamano <junio@xxxxxxxxx>"
gpg: aka "Junio C Hamano <jch@xxxxxxxxxx>"
Merge: 406da78 f3f778d
Author: Junio C Hamano <gitster@xxxxxxxxx>
Date: Wed Jan 4 14:05:03 2012 -0800
Merge tag 'v1.7.8.2' of ../git into HEAD
Git 1.7.8.2
Junio C Hamano (3):
verify_signed_buffer: fix stale comment
log-tree.c: small refactor in show_signature()
log-tree: show mergetag in log --show-signature output
gpg-interface.c | 5 +--
log-tree.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 92 insertions(+), 17 deletions(-)
--
1.7.8.2.340.gd18f0f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html