From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2018 20:09:54 +0000 (-0700)
Subject: Merge branch 'es/rebase-i-author-script-fix'
X-Git-Tag: v2.19.0-rc0~55
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1bc505b4768e9e48592bebfff35e18c5277412da?ds=inline;hp=--cc

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

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
---

1bc505b4768e9e48592bebfff35e18c5277412da
diff --cc sequencer.c
index af204d0cf1,944dea6997..f74dafb325
--- a/sequencer.c
+++ b/sequencer.c
@@@ -715,9 -715,9 +718,9 @@@ static const char *read_author_ident(st
  		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'",
 +			warning(_("could not parse '%s' (looking for '%s'"),
  				rebase_path_author_script(), keys[i]);
  			return NULL;
  		}