From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 16:26:27 +0000 (-0700)
Subject: Merge branch 'mg/gpg-interface-using-status' into maint
X-Git-Tag: v1.8.2.1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b771d8d7cf9dd9d5901e68526be471722870a9f8;p=thirdparty%2Fgit.git

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

Verification of signed tags were not done correctly when not in C
or en/US locale.

* 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
---

b771d8d7cf9dd9d5901e68526be471722870a9f8
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);