sequencer: fix "rebase -i --root" corrupting author header timezone

When "git rebase -i --root" creates a new root commit, it corrupts the
"author" header's timezone by repeating the last digit:

    author A U Thor <author@example.com> @1112912773 -07000

This is due to two bugs.

First, write_author_script() neglects to add the closing quote to the
value of GIT_AUTHOR_DATE when generating "rebase-merge/author-script".

Second, although sq_dequote() correctly diagnoses the missing closing
quote, read_author_ident() ignores sq_dequote()'s return value and
blindly uses the result of the aborted dequote.

sq_dequote() performs dequoting in-place by removing quoting and
shifting content downward. When it detects misquoting (lack of closing
quote, in this case), it gives up and returns an error without inserting
a NUL-terminator at the end of the shifted content, which explains the
duplicated last digit in the timezone.

(Note that the "@" preceding the timestamp is a separate bug which
will be fixed subsequently.)

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index df11136f9d288fac20db5d030fee6bae7fab3365..2b66b85373a46bfaf6a3b0b5bc1af145b4fa98b8 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -651,6 +651,7 @@ missing_author:
                        strbuf_addch(&buf, *(message++));
                else
                        strbuf_addf(&buf, "'\\\\%c'", *(message++));
+       strbuf_addch(&buf, '\'');
        res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1);
        strbuf_release(&buf);
        return res;
@@ -721,7 +722,11 @@ static const char *read_author_ident(struct strbuf *buf)
 
                eol = strchrnul(in, '\n');
                *eol = '\0';
-               sq_dequote(in);
+               if (!sq_dequote(in)) {
+                       warning(_("bad quoting on %s value in '%s'"),
+                               keys[i], rebase_path_author_script());
+                       return NULL;
+               }
                len = strlen(in);
 
                if (i > 0) /* separate values by spaces */

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 347a09502e86c2eb3fa2a457c234301480771aa4..092139096eef048b4abd55f91f0b60146150a3db 100755 (executable)
--- 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]*$" out
+       grep "^author ..*> @[0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$" out
 '
 
 test_done