Merge branch 'ph/maint-submodule-status-fix'

diff --git a/gpg-interface.c b/gpg-interface.c
index 18630ff8da1158bb3ab5e1193ab8ef05d48e3bbe..0863c618007a02fa20c27b62614de8a554128d0c 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -30,7 +30,7 @@ const char *get_signing_key(void)
 {
        if (configured_signing_key)
                return configured_signing_key;
-       return git_committer_info(IDENT_ERROR_ON_NO_NAME|IDENT_NO_DATE);
+       return git_committer_info(IDENT_STRICT|IDENT_NO_DATE);
 }
 
 /*
@@ -95,10 +95,7 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
 
 /*
  * Run "gpg" to see if the payload matches the detached signature.
- * gpg_output_to tells where the output from "gpg" should go:
- *   < 0: /dev/null
- *   = 0: standard error of the calling process
- *   > 0: the specified file descriptor
+ * gpg_output, when set, receives the diagnostic output from GPG.
  */
 int verify_signed_buffer(const char *payload, size_t payload_size,
                         const char *signature, size_t signature_size,