Merge branch 'jc/mergetool-tool-help' into maint

diff --git a/http-push.c b/http-push.c
index 1df7ab5670d0ba2823da14083934925b0f05c926..a832ca77a31245e8ef9c71adcc0d7110fcda1e5c 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -904,7 +904,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
                ep = strchr(ep + 1, '/');
        }
 
-       escaped = xml_entities(git_default_email);
+       escaped = xml_entities(ident_default_email());
        strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped);
        free(escaped);