Merge branch 'mg/gpg-interface-using-status' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:26:27 +0000 (09:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:26:27 +0000 (09:26 -0700)
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

1  2 
Documentation/pretty-formats.txt
builtin/fmt-merge-msg.c
gpg-interface.c
log-tree.c
pretty.c

Simple merge
Simple merge
diff --cc 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);
diff --cc log-tree.c
Simple merge
diff --cc pretty.c
Simple merge