merge-recursive: restore accidentally dropped setting of path

diff --git a/ident.c b/ident.c
index 33bcf40644cdf23434a7cb622b6be71bb7cd867c..9c2eb0a2d02ac823a6bf3f01603dfdc7164728c8 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -11,6 +11,10 @@
 static struct strbuf git_default_name = STRBUF_INIT;
 static struct strbuf git_default_email = STRBUF_INIT;
 static struct strbuf git_default_date = STRBUF_INIT;
+static struct strbuf git_author_name = STRBUF_INIT;
+static struct strbuf git_author_email = STRBUF_INIT;
+static struct strbuf git_committer_name = STRBUF_INIT;
+static struct strbuf git_committer_email = STRBUF_INIT;
 static int default_email_is_bogus;
 static int default_name_is_bogus;
 
@@ -355,13 +359,19 @@ N_("\n"
    "\n");
 
 const char *fmt_ident(const char *name, const char *email,
-                     const char *date_str, int flag)
+                     enum want_ident whose_ident, const char *date_str, int flag)
 {
        static struct strbuf ident = STRBUF_INIT;
        int strict = (flag & IDENT_STRICT);
        int want_date = !(flag & IDENT_NO_DATE);
        int want_name = !(flag & IDENT_NO_NAME);
 
+       if (!email) {
+               if (whose_ident == WANT_AUTHOR_IDENT && git_author_email.len)
+                       email = git_author_email.buf;
+               else if (whose_ident == WANT_COMMITTER_IDENT && git_committer_email.len)
+                       email = git_committer_email.buf;
+       }
        if (!email) {
                if (strict && ident_use_config_only
                    && !(ident_config_given & IDENT_MAIL_GIVEN)) {
@@ -377,6 +387,13 @@ const char *fmt_ident(const char *name, const char *email,
 
        if (want_name) {
                int using_default = 0;
+               if (!name) {
+                       if (whose_ident == WANT_AUTHOR_IDENT && git_author_name.len)
+                               name = git_author_name.buf;
+                       else if (whose_ident == WANT_COMMITTER_IDENT &&
+                                       git_committer_name.len)
+                               name = git_committer_name.buf;
+               }
                if (!name) {
                        if (strict && ident_use_config_only
                            && !(ident_config_given & IDENT_NAME_GIVEN)) {
@@ -425,9 +442,25 @@ const char *fmt_ident(const char *name, const char *email,
        return ident.buf;
 }
 
-const char *fmt_name(const char *name, const char *email)
+const char *fmt_name(enum want_ident whose_ident)
 {
-       return fmt_ident(name, email, NULL, IDENT_STRICT | IDENT_NO_DATE);
+       char *name = NULL;
+       char *email = NULL;
+
+       switch (whose_ident) {
+       case WANT_BLANK_IDENT:
+               break;
+       case WANT_AUTHOR_IDENT:
+               name = getenv("GIT_AUTHOR_NAME");
+               email = getenv("GIT_AUTHOR_EMAIL");
+               break;
+       case WANT_COMMITTER_IDENT:
+               name = getenv("GIT_COMMITTER_NAME");
+               email = getenv("GIT_COMMITTER_EMAIL");
+               break;
+       }
+       return fmt_ident(name, email, whose_ident, NULL,
+                       IDENT_STRICT | IDENT_NO_DATE);
 }
 
 const char *git_author_info(int flag)
@@ -438,6 +471,7 @@ const char *git_author_info(int flag)
                author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
        return fmt_ident(getenv("GIT_AUTHOR_NAME"),
                         getenv("GIT_AUTHOR_EMAIL"),
+                        WANT_AUTHOR_IDENT,
                         getenv("GIT_AUTHOR_DATE"),
                         flag);
 }
@@ -450,6 +484,7 @@ const char *git_committer_info(int flag)
                committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
        return fmt_ident(getenv("GIT_COMMITTER_NAME"),
                         getenv("GIT_COMMITTER_EMAIL"),
+                        WANT_COMMITTER_IDENT,
                         getenv("GIT_COMMITTER_DATE"),
                         flag);
 }
@@ -473,10 +508,45 @@ int author_ident_sufficiently_given(void)
        return ident_is_sufficient(author_ident_explicitly_given);
 }
 
-int git_ident_config(const char *var, const char *value, void *data)
+static int set_ident(const char *var, const char *value)
 {
-       if (!strcmp(var, "user.useconfigonly")) {
-               ident_use_config_only = git_config_bool(var, value);
+       if (!strcmp(var, "author.name")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               strbuf_reset(&git_author_name);
+               strbuf_addstr(&git_author_name, value);
+               author_ident_explicitly_given |= IDENT_NAME_GIVEN;
+               ident_config_given |= IDENT_NAME_GIVEN;
+               return 0;
+       }
+
+       if (!strcmp(var, "author.email")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               strbuf_reset(&git_author_email);
+               strbuf_addstr(&git_author_email, value);
+               author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+               ident_config_given |= IDENT_MAIL_GIVEN;
+               return 0;
+       }
+
+       if (!strcmp(var, "committer.name")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               strbuf_reset(&git_committer_name);
+               strbuf_addstr(&git_committer_name, value);
+               committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
+               ident_config_given |= IDENT_NAME_GIVEN;
+               return 0;
+       }
+
+       if (!strcmp(var, "committer.email")) {
+               if (!value)
+                       return config_error_nonbool(var);
+               strbuf_reset(&git_committer_email);
+               strbuf_addstr(&git_committer_email, value);
+               committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+               ident_config_given |= IDENT_MAIL_GIVEN;
                return 0;
        }
 
@@ -505,6 +575,16 @@ int git_ident_config(const char *var, const char *value, void *data)
        return 0;
 }
 
+int git_ident_config(const char *var, const char *value, void *data)
+{
+       if (!strcmp(var, "user.useconfigonly")) {
+               ident_use_config_only = git_config_bool(var, value);
+               return 0;
+       }
+
+       return set_ident(var, value);
+}
+
 static int buf_cmp(const char *a_begin, const char *a_end,
                   const char *b_begin, const char *b_end)
 {