diff options
| -rw-r--r-- | sequencer.c | 23 | ||||
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
2 files changed, 10 insertions, 15 deletions
diff --git a/sequencer.c b/sequencer.c index 2b66b85373..580516959d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -706,14 +706,16 @@ static const char *read_author_ident(struct strbuf *buf) const char *keys[] = { "GIT_AUTHOR_NAME=", "GIT_AUTHOR_EMAIL=", "GIT_AUTHOR_DATE=" }; - char *in, *out, *eol; - int i = 0, len; + struct strbuf out = STRBUF_INIT; + char *in, *eol; + const char *val[3]; + int i = 0; if (strbuf_read_file(buf, rebase_path_author_script(), 256) <= 0) return NULL; /* dequote values and construct ident line in-place */ - for (in = out = buf->buf; i < 3 && in - buf->buf < buf->len; i++) { + for (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) { if (!skip_prefix(in, keys[i], (const char **)&in)) { warning("could not parse '%s' (looking for '%s'", rebase_path_author_script(), keys[i]); @@ -727,16 +729,7 @@ static const char *read_author_ident(struct strbuf *buf) keys[i], rebase_path_author_script()); return NULL; } - len = strlen(in); - - if (i > 0) /* separate values by spaces */ - *(out++) = ' '; - if (i == 1) /* email needs to be surrounded by <...> */ - *(out++) = '<'; - memmove(out, in, len); - out += len; - if (i == 1) /* email needs to be surrounded by <...> */ - *(out++) = '>'; + val[i] = in; in = eol + 1; } @@ -746,7 +739,9 @@ static const char *read_author_ident(struct strbuf *buf) return NULL; } - strbuf_setlen(buf, out - buf->buf); + strbuf_addstr(&out, fmt_ident(val[0], val[1], val[2], 0)); + strbuf_swap(buf, &out); + strbuf_release(&out); return buf->buf; } diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 092139096e..b72167ecd5 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1384,7 +1384,7 @@ test_expect_success 'valid author header after --root swap' ' set_fake_editor && FAKE_LINES="2 1" git rebase -i --root && git cat-file commit HEAD^ >out && - grep "^author ..*> @[0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$" out + grep "^author ..*> [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$" out ' test_done |