oneway_merge(): only lstat() when told to update worktree

diff --git a/gpg-interface.c b/gpg-interface.c
index 09ab64aa24a1239cdb1ed5259c0b975a89594e9c..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);
 }
 
 /*