@matheusbsbs / matheus-bagliano / commits / 0f16c09aae

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>

Eric Sunshine committed Jul 31, 2018 at 03:33 UTC 0f16c09aaeabf0f543693a21535e670a2b808e9e

2 files changed +7 -2

sequencer.c

+6 -1

@@ -651,6 +651,7 @@ missing_author:

651 strbuf_addch(&buf, *(message++));

652 else

653 strbuf_addf(&buf, "'\\\\%c'", *(message++));

654 + strbuf_addch(&buf, '\'');

655 res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1);

656 strbuf_release(&buf);

657 return res;

@@ -721,7 +722,11 @@ static const char *read_author_ident(struct strbuf *buf)

722

723 eol = strchrnul(in, '\n');

724 *eol = '\0';

724 - sq_dequote(in);

725 + if (!sq_dequote(in)) {

726 + warning(_("bad quoting on %s value in '%s'"),

727 + keys[i], rebase_path_author_script());

728 + return NULL;

729 + }

730 len = strlen(in);

731

732 if (i > 0) /* separate values by spaces */

t/t3404-rebase-interactive.sh

+1 -1

@@ -1384,7 +1384,7 @@ test_expect_success 'valid author header after --root swap' '

1384 set_fake_editor &&

1385 FAKE_LINES="2 1" git rebase -i --root &&

1386 git cat-file commit HEAD^ >out &&

1387 - grep "^author ..*> @[0-9][0-9]* [-+][0-9][0-9]*$" out

1387 + grep "^author ..*> @[0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$" out

1388 '

1389

1390 test_done