From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Mar 2013 21:02:55 +0000 (-0700)
Subject: Merge branch 'mg/gpg-interface-using-status'
X-Git-Tag: v1.8.3-rc0~197
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0f6875dbe2598fd2e9a597a9e42cde4a507140dd

Merge branch 'mg/gpg-interface-using-status'

Call "gpg" using the right API when validating the signature on
tags.

* mg/gpg-interface-using-status:
pretty: make %GK output the signing key for signed commits
pretty: parse the gpg status lines rather than the output
gpg_interface: allow to request status return
log-tree: rely upon the check in the gpg_interface
gpg-interface: check good signature in a reliable way
---

0f6875dbe2598fd2e9a597a9e42cde4a507140dd
diff --cc gpg-interface.c
index 45590330aa,ce07cd5cbb..8b0e87436b
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@@ -119,12 -122,13 +122,13 @@@ int verify_signed_buffer(const char *pa
  	memset(&gpg, 0, sizeof(gpg));
  	gpg.argv = args_gpg;
  	gpg.in = -1;
+ 	gpg.out = -1;
  	if (gpg_output)
  		gpg.err = -1;
- 	args_gpg[2] = path;
+ 	args_gpg[3] = path;
  	if (start_command(&gpg)) {
  		unlink(path);
 -		return error("could not run gpg.");
 +		return error(_("could not run gpg."));
  	}
  
  	write_in_full(gpg.in, payload, payload_size);