undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'es/rebase-i-author-script-fix'

Browse Source 
The "author-script" file "git rebase -i" creates got broken when
we started to move the command away from shell script, which is
getting fixed now.

* es/rebase-i-author-script-fix:
  sequencer: don't die() on bogus user-edited timestamp
  sequencer: fix "rebase -i --root" corrupting author header timestamp
  sequencer: fix "rebase -i --root" corrupting author header timezone
  sequencer: fix "rebase -i --root" corrupting author header
This commit is contained in:
Junio C Hamano 2018-08-17 13:09:54 -07:00
commit 1bc505b476
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sequencer.c
View File

@ -654,6 +654,7 @@ missing_author:
strbuf_addch(&buf, *(message++)); strbuf_addch(&buf, *(message++));
else else
strbuf_addf(&buf, "'\\\\%c'", *(message++)); strbuf_addf(&buf, "'\\\\%c'", *(message++));
strbuf_addch(&buf, '\'');
res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1); res = write_message(buf.buf, buf.len, rebase_path_author_script(), 1);
strbuf_release(&buf); strbuf_release(&buf);
return res; return res;
@ -708,14 +709,16 @@ static const char *read_author_ident(struct strbuf *buf)
const char *keys[] = { const char *keys[] = {
"GIT_AUTHOR_NAME=", "GIT_AUTHOR_EMAIL=", "GIT_AUTHOR_DATE=" "GIT_AUTHOR_NAME=", "GIT_AUTHOR_EMAIL=", "GIT_AUTHOR_DATE="
}; };
char *in, *out, *eol; struct strbuf out = STRBUF_INIT;
int i = 0, len; char *in, *eol;
const char *val[3];
int i = 0;
if (strbuf_read_file(buf, rebase_path_author_script(), 256) <= 0) if (strbuf_read_file(buf, rebase_path_author_script(), 256) <= 0)
return NULL; return NULL;
/* dequote values and construct ident line in-place */ /* 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)) { if (!skip_prefix(in, keys[i], (const char **)&in)) {
warning(_("could not parse '%s' (looking for '%s'"), warning(_("could not parse '%s' (looking for '%s'"),
rebase_path_author_script(), keys[i]); rebase_path_author_script(), keys[i]);
@ -724,17 +727,12 @@ static const char *read_author_ident(struct strbuf *buf)
eol = strchrnul(in, '\n'); eol = strchrnul(in, '\n');
*eol = '\0'; *eol = '\0';
sq_dequote(in); if (!sq_dequote(in)) {
len = strlen(in); warning(_("bad quoting on %s value in '%s'"),
keys[i], rebase_path_author_script());
if (i > 0) /* separate values by spaces */ return NULL;
*(out++) = ' '; }
if (i == 1) /* email needs to be surrounded by <...> */ val[i] = in;
*(out++) = '<';
memmove(out, in, len);
out += len;
if (i == 1) /* email needs to be surrounded by <...> */
*(out++) = '>';
in = eol + 1; in = eol + 1;
} }
@ -744,7 +742,18 @@ static const char *read_author_ident(struct strbuf *buf)
return NULL; return NULL;
} }
buf->len = out - buf->buf; /* validate date since fmt_ident() will die() on bad value */
if (parse_date(val[2], &out)){
warning(_("invalid date format '%s' in '%s'"),
val[2], rebase_path_author_script());
strbuf_release(&out);
return NULL;
}
strbuf_reset(&out);
strbuf_addstr(&out, fmt_ident(val[0], val[1], val[2], 0));
strbuf_swap(buf, &out);
strbuf_release(&out);
return buf->buf; return buf->buf;
} }

10
t/t3404-rebase-interactive.sh
View File

@ -1247,7 +1247,7 @@ rebase_setup_and_clean () {
test_might_fail git branch -D $1 && test_might_fail git branch -D $1 &&
test_might_fail git rebase --abort test_might_fail git rebase --abort
" && " &&
git checkout -b $1 master git checkout -b $1 ${2:-master}
} }
test_expect_success 'drop' ' test_expect_success 'drop' '
@ -1424,4 +1424,12 @@ test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
' '
test_expect_success 'valid author header after --root swap' '
rebase_setup_and_clean author-header no-conflict-branch &&
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
'
test_done test_done