merge-tree: don't print entries that match "local"

diff --git a/gpg-interface.c b/gpg-interface.c
index 09ab64aa24a1239cdb1ed5259c0b975a89594e9c..5f142f619855ccd664a84be366bf6877a48e6da4 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);
 }
 
 /*
@@ -130,8 +130,10 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
        write_in_full(gpg.in, payload, payload_size);
        close(gpg.in);
 
-       if (gpg_output)
+       if (gpg_output) {
                strbuf_read(gpg_output, gpg.err, 0);
+               close(gpg.err);
+       }
        ret = finish_command(&gpg);
 
        unlink_or_warn(path);