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

diff --cc sequencer.c
index af204d0cf118070b037120eec3a02c6ac2a59ca8,944dea6997b431938dcd3815e53b2fcae03ba9e0..f74dafb3259771571a67e6cbeaf22c4129a020d9
--- 1/sequencer.c
--- 2/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;
                }

diff --cc t/t3404-rebase-interactive.sh
Simple merge