Shawn O. Pearce wrote:
> Some importers are probably
> writing "committer <bob> ...." when pulling from systems that don't
> have a concept of name vs. email (e.g. CVS or SVN). I highly suspect
> that requiring two spaces here will cause a lot of importers to fail.
>
> If we really need to require two spaces,
It is not a huge deal, but ‘git commit --amend’ will die with "invalid
commit" if it does not find a “ <” sequence after the “author ”
string. Maybe that should be changed. Patch below.
> I think we need to honor
> the documented input format but rewrite the line inside of the
> import process to match the two space convention.
Yes, that’s doable.
Thanks for the feedback,
Jonathan
diff --git a/builtin/commit.c b/builtin/commit.c
index c5ab683..c56f2c9 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -449,19 +449,23 @@ static void determine_author_info(void)
date = getenv("GIT_AUTHOR_DATE");
if (use_message && !renew_authorship) {
- const char *a, *lb, *rb, *eol;
+ const char *a, *n, *lb, *rb, *eol;
a = strstr(use_message_buffer, "\nauthor ");
if (!a)
die("invalid commit: %s", use_message);
- lb = strstr(a + 8, " <");
- rb = strstr(a + 8, "> ");
- eol = strchr(a + 8, '\n');
+ n = a + strlen("\nauthor");
+ lb = strstr(n, " <");
+ rb = strstr(lb + 2, "> ");
+ eol = strchr(rb + 2, '\n');
if (!lb || !rb || !eol)
die("invalid commit: %s", use_message);
- name = xstrndup(a + 8, lb - (a + 8));
+ if (lb == n)
+ name = xstrndup("", 0);
+ else
+ name = xstrndup(n + 1, lb - (n + 1));
email = xstrndup(lb + 2, rb - (lb + 2));
date = xstrndup(rb + 2, eol - (rb + 2));
}
@@ -470,7 +474,7 @@ static void determine_author_info(void)
const char *lb = strstr(force_author, " <");
const char *rb = strchr(force_author, '>');
- if (!lb || !rb)
+ if (!lb || !rb || rb < lb)
die("malformed --author parameter");
name = xstrndup(force_author, lb - force_author);
email = xstrndup(lb + 2, rb - (lb + 2));
--
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html