Merge branch 'jk/repo-init-cleanup'

diff --git a/gpg-interface.h b/gpg-interface.h
index a5e6517ae67ea5fa3f79265517381d58d99fba18..3e624ec289ab5f46b686f9eb2489c997bca23232 100644 (file)
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -1,6 +1,8 @@
 #ifndef GPG_INTERFACE_H
 #define GPG_INTERFACE_H
 
+struct strbuf;
+
 #define GPG_VERIFY_VERBOSE             1
 #define GPG_VERIFY_RAW                 2
 #define GPG_VERIFY_OMIT_STATUS 4
@@ -21,6 +23,8 @@ struct signature_check {
        char result;
        char *signer;
        char *key;
+       char *fingerprint;
+       char *primary_key_fingerprint;
 };
 
 void signature_check_clear(struct signature_check *sigc);
@@ -33,8 +37,6 @@ void signature_check_clear(struct signature_check *sigc);
  */
 size_t parse_signature(const char *buf, size_t size);
 
-void parse_gpg_output(struct signature_check *);
-
 /*
  * Create a detached signature for the contents of "buffer" and append
  * it after "signature"; "buffer" and "signature" can be the same