From: Elliot Wolk <elliot.wolk@gmail•com>
To: git@vger•kernel.org
Subject: rebase --root conflicts with --committer-date-is-author-date
Date: Sat, 11 Apr 2015 14:29:55 -0400 [thread overview]
Message-ID: <55296823.4010409@gmail.com> (raw)
============
version:
git version 2.1.4
Linux wolke-w520 3.19.3-towo.1-siduction-amd64 #1 SMP PREEMPT siduction
3.19-9 (2015-03-26) x86_64 GNU/Linux
============
summary:
if i do `git rebase --committer-date-is-author-date --root', the
committer date is set to now, instead of set to the author date.
when rebasing onto the first commit, it works perfectly well.
============
reproduce:
set -x
cd
mkdir test
cd test
git init
echo line >> a; git add a; git commit -m 'jan1' --date '2015-01-01'
echo line >> a; git add a; git commit -m 'jan2' --date '2015-01-02'
echo line >> a; git add a; git commit -m 'jan3' --date '2015-01-03'
git log --format=format:%s-%cD-%aD%n
git rebase --committer-date-is-author-date HEAD^^
git log --format=format:%s-%cD-%aD%n
git rebase --committer-date-is-author-date --root
git log --format=format:%s-%cD-%aD%n
git rebase --committer-date-is-author-date HEAD^^
git log --format=format:%s-%cD-%aD%n
git rebase --committer-date-is-author-date --root
git log --format=format:%s-%cD-%aD%n
============
expected:
jan3-Sat, 03 Jan 2015 13:28:06 -0500-Sat, 3 Jan 2015 13:28:06 -0500
jan2-Sat, 02 Jan 2015 13:28:06 -0500-Fri, 2 Jan 2015 13:28:06 -0500
jan1-Sat, 01 Jan 2015 13:28:06 -0500-Thu, 1 Jan 2015 13:28:06 -0500
============
actual:
jan3-Sat, 11 Apr 2015 14:28:06 -0400-Sat, 3 Jan 2015 13:28:06 -0500
jan2-Sat, 11 Apr 2015 14:28:06 -0400-Fri, 2 Jan 2015 13:28:06 -0500
jan1-Sat, 11 Apr 2015 14:28:06 -0400-Thu, 1 Jan 2015 13:28:06 -0500
{full output: http://pastie.org/10086950}
============
sorry if dupe/wrong-venue/poorly-formatted/incomprehensible. i tried.
next reply other threads:[~2015-04-11 18:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-11 18:29 Elliot Wolk [this message]
2015-04-12 6:19 ` rebase --root conflicts with --committer-date-is-author-date Junio C Hamano
2015-04-16 22:15 ` Chris Webb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55296823.4010409@gmail.com \
--to=elliot.wolk@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox