git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
	"Phillip Wood" <phillip.wood@dunelm.org.uk>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>,
	Elijah Newren <newren@gmail.com>,
	Rohit Ashiwal <rohit.ashiwal265@gmail.com>,
	Alban Gruin <alban.gruin@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v3 4/5] rebase -i: support --ignore-date
Date: Sat, 23 May 2020 16:43:39 +0100
Message-ID: <bc6bc4d4-79cb-f788-deca-41a3735fcaae@gmail.com> (raw)
In-Reply-To: <20200523123025.GA20683@danh.dev>

Hi Danh

On 23/05/2020 13:30, Đoàn Trần Công Danh wrote:
> Hi Phillip,
> 
> On 2020-05-21 11:14:54+0100, Phillip Wood <phillip.wood123@gmail.com> wrote:
>> +# Checking for +0000 in author time is enough since default
>> +# timezone is UTC, but the timezone used while committing
>> +# sets to +0530.
>> +test_expect_success '--ignore-date works with apply backend' '
>> +	git commit --amend --date="$GIT_AUTHOR_DATE" &&
>> +	git rebase --apply --ignore-date HEAD^ &&
>> +	git log -1 --pretty="format:%ai" >authortime &&
> 
> Those --pretty="format:%ai" won't print the newline character in my
> test environment.
> It looks like it won't print the newline if stdout isn't a tty.
> 
> 	git log -1 --pretty=%ai
> 
> doesn't have that issue.
> 
> I think there're some grep out there considers file doesn't end with
> newline as non-text files.

Yes it would be better to print the newline, thanks

>> +	grep "+0000" authortime
>> +'
>> +
>> +test_expect_success '--ignore-date works with merge backend' '
>> +	git commit --amend --date="$GIT_AUTHOR_DATE" &&
>> +	git rebase --ignore-date -m HEAD^ &&
>> +	git log -1 --pretty="format:%ai" >authortime &&
>> +	grep "+0000" authortime
>> +'
>> +
>> +test_expect_success '--ignore-date works after conflict resolution' '
>> +	test_must_fail git rebase --ignore-date -m \
>> +		--onto commit2^^ commit2^ commit2 &&
>> +	echo resolved >foo &&
>> +	git add foo &&
>> +	git rebase --continue &&
>> +	git log --pretty=%ai >authortime &&
>> +	grep +0000 authortime
>> +'
> 
>  From the test's name, I guess git-rebase is supposed to continue
> respect --ignore-date after conflict resolution.
> 
> But the content of authortime read:
> 
> 	2020-05-23 12:13:58 +0000
> 	1999-04-02 08:03:20 +0530
> 	1999-04-02 08:03:20 +0530
> 
> It's still pass "grep +0000 authortime" because of first line,
> I'm not sure if I missed anything.

It's only rebasing one commit - the log command is missing -1. I've 
checked the log invocations in the other tests and I think they're all OK.

Junio - are you happy to fix this up (assuming there are no other 
issues) or do you want a re-roll?

Thanks

Phillip

  reply index

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-07 14:11 [PATCH 0/6] fixup ra/rebase-i-more-options Phillip Wood
2020-04-07 14:11 ` [PATCH 1/6] Revert "Revert "Merge branch 'ra/rebase-i-more-options'"" Phillip Wood
2020-04-07 15:16   ` Elijah Newren
2020-04-07 18:01     ` Phillip Wood
2020-04-07 21:04     ` Junio C Hamano
2020-04-07 21:31       ` Junio C Hamano
2020-04-12 17:47         ` Johannes Schindelin
2020-04-13  9:58           ` Phillip Wood
2020-04-13 22:05             ` Junio C Hamano
2020-04-07 14:11 ` [PATCH 2/6] t3433: remove loops from tests Phillip Wood
2020-04-07 14:30   ` Elijah Newren
2020-04-07 14:11 ` [PATCH 3/6] t3433: only compare commit dates Phillip Wood
2020-04-07 14:11 ` [PATCH 4/6] rebase -i: fix --committer-date-is-author-date Phillip Wood
2020-04-07 15:05   ` Elijah Newren
2020-04-07 18:11     ` Phillip Wood
2020-04-07 14:11 ` [PATCH 5/6] Revert "sequencer: allow callers of read_author_script() to ignore fields" Phillip Wood
2020-04-07 15:06   ` Elijah Newren
2020-04-07 14:11 ` [PATCH 6/6] t3433: improve coverage Phillip Wood
2020-04-07 15:13   ` Elijah Newren
2020-04-07 18:16     ` Phillip Wood
2020-04-07 15:17 ` [PATCH 0/6] fixup ra/rebase-i-more-options Elijah Newren
2020-04-07 18:18   ` Phillip Wood
2020-04-07 23:04 ` Junio C Hamano
2020-04-29 10:25 ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Phillip Wood
2020-04-29 10:25   ` [PATCH v2 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-13  3:54     ` Elijah Newren
2020-05-14  9:47       ` Phillip Wood
2020-04-29 10:25   ` [PATCH v2 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-10 11:14     ` Alban Gruin
2020-05-13  4:08     ` Elijah Newren
2020-04-29 10:25   ` [PATCH v2 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-04-29 10:25   ` [PATCH v2 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-10 11:14     ` Alban Gruin
2020-05-12 14:47       ` Phillip Wood
2020-05-13 15:33         ` Junio C Hamano
2020-05-13  3:54     ` Elijah Newren
2020-04-29 10:25   ` [PATCH v2 5/5] rebase: add --reset-author-date Phillip Wood
2020-04-29 19:59   ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-05-13  3:57     ` Elijah Newren
2020-05-21 10:14 ` [PATCH v3 " Phillip Wood
2020-05-21 10:14   ` [PATCH v3 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-21 10:14   ` [PATCH v3 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-21 10:14   ` [PATCH v3 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-21 10:14   ` [PATCH v3 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-23 12:30     ` Đoàn Trần Công Danh
2020-05-23 15:43       ` Phillip Wood [this message]
2020-05-23 15:52         ` Đoàn Trần Công Danh
2020-05-23 18:50           ` Phillip Wood
2020-05-23 23:05             ` Đoàn Trần Công Danh
2020-05-27  9:55               ` Phillip Wood
2020-05-24 16:32           ` Junio C Hamano
2020-05-21 10:14   ` [PATCH v3 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-22 15:54   ` [PATCH v3 0/5] cleanup ra/rebase-i-more-options Elijah Newren
2020-05-23  8:55     ` Phillip Wood
2020-05-23  6:59   ` Johannes Schindelin
2020-05-27 17:33 ` [PATCH v4 " Phillip Wood
2020-05-27 17:33   ` [PATCH v4 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-29  2:38     ` Johannes Schindelin
2020-06-01  9:23       ` Kerry, Richard
2020-06-01 10:26       ` Phillip Wood
2020-06-01 21:03         ` Johannes Schindelin
2020-05-27 17:33   ` [PATCH v4 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-29  2:52     ` Johannes Schindelin
2020-06-01 10:33       ` Phillip Wood
2020-05-27 17:33   ` [PATCH v4 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-27 17:33   ` [PATCH v4 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-27 17:33   ` [PATCH v4 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-27 17:57     ` [PATCH v4 6/5] fixup! " Phillip Wood
2020-05-28 13:17       ` Đoàn Trần Công Danh
2020-05-29  2:59         ` Johannes Schindelin
2020-06-01 10:36           ` Phillip Wood
2020-05-27 21:10   ` [PATCH v4 0/5] cleanup ra/rebase-i-more-options Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bc6bc4d4-79cb-f788-deca-41a3735fcaae@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=alban.gruin@gmail.com \
    --cc=congdanhqx@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=rohit.ashiwal265@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror http://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git