commit: do not trigger bogus "has templated message edited" check

diff --git a/credential.c b/credential.c
index 3c17ea19732c01dbd2a32bd3f3c97483ef2f5556..62d1c56819e5351e5697dab7ff13d33ac806c398 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -3,6 +3,7 @@
 #include "string-list.h"
 #include "run-command.h"
 #include "url.h"
+#include "prompt.h"
 
 void credential_init(struct credential *c)
 {
@@ -69,16 +70,30 @@ static int credential_config_callback(const char *var, const char *value,
                if (!c->username)
                        c->username = xstrdup(value);
        }
+       else if (!strcmp(key, "usehttppath"))
+               c->use_http_path = git_config_bool(var, value);
 
        return 0;
 }
 
+static int proto_is_http(const char *s)
+{
+       if (!s)
+               return 0;
+       return !strcmp(s, "https") || !strcmp(s, "http");
+}
+
 static void credential_apply_config(struct credential *c)
 {
        if (c->configured)
                return;
        git_config(credential_config_callback, c);
        c->configured = 1;
+
+       if (!c->use_http_path && proto_is_http(c->protocol)) {
+               free(c->path);
+               c->path = NULL;
+       }
 }
 
 static void credential_describe(struct credential *c, struct strbuf *out)
@@ -94,7 +109,8 @@ static void credential_describe(struct credential *c, struct strbuf *out)
                strbuf_addf(out, "/%s", c->path);
 }
 
-static char *credential_ask_one(const char *what, struct credential *c)
+static char *credential_ask_one(const char *what, struct credential *c,
+                               int flags)
 {
        struct strbuf desc = STRBUF_INIT;
        struct strbuf prompt = STRBUF_INIT;
@@ -106,11 +122,7 @@ static char *credential_ask_one(const char *what, struct credential *c)
        else
                strbuf_addf(&prompt, "%s: ", what);
 
-       /* FIXME: for usernames, we should do something less magical that
-        * actually echoes the characters. However, we need to read from
-        * /dev/tty and not stdio, which is not portable (but getpass will do
-        * it for us). http.c uses the same workaround. */
-       r = git_getpass(prompt.buf);
+       r = git_prompt(prompt.buf, flags);
 
        strbuf_release(&desc);
        strbuf_release(&prompt);
@@ -120,9 +132,11 @@ static char *credential_ask_one(const char *what, struct credential *c)
 static void credential_getpass(struct credential *c)
 {
        if (!c->username)
-               c->username = credential_ask_one("Username", c);
+               c->username = credential_ask_one("Username", c,
+                                                PROMPT_ASKPASS|PROMPT_ECHO);
        if (!c->password)
-               c->password = credential_ask_one("Password", c);
+               c->password = credential_ask_one("Password", c,
+                                                PROMPT_ASKPASS);
 }
 
 int credential_read(struct credential *c, FILE *fp)