Hi Ævar, thanks for your comments On 18/04/18 12:27, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Apr 18 2018, Phillip Wood wrote: > >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> >> Now that the sequencer commits without forking when the commit message >> isn't edited all the commits that are picked have the same committer >> date. If a commit is reworded it's committer date will be a later time > > s/it's/its/ Thanks I'll change it >> as it is created by running an separate instance of 'git commit'. If >> the reworded commit is follow by further picks, those later commits >> will have an earlier committer date than the reworded one. This is >> caused by git caching the default date used when GIT_COMMITTER_DATE is >> not set. Fix this by not caching the date. >> >> Users expect commits to have the same author and committer dates when >> the don't explicitly set them. As the date is now updated each time >> git_author_info() or git_committer_info() is run it is possible to end >> up with different author and committer dates. Fix this for >> 'commit-tree', 'notes' and 'merge' by using a single date in >> commit_tree_extended() and passing it explicitly to the new functions >> git_author_info_with_date() and git_committer_info_with_date() when >> neither the author date nor the committer date are explicitly >> set. 'commit' always passes the author date to commit_tree_extended() >> and relied on the date caching to have the same committer and author >> dates when neither was specified. Fix this by setting >> GIT_COMMITTER_DATE to be the same as the author date passed to >> commit_tree_extended(). >> >> Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> Reported-by: Johannes Sixt <j6t@xxxxxxxx> >> --- >> >> I'm slightly nervous that setting GIT_COMMITTER_DATE in >> builtin/commit.c will break someone's hook script. Maybe it would be >> better to add a committer parameter to commit_tree() and >> commit_tree_extended(). >> >> This needs some tests. I think we could test that the sequencer gives >> each commit a new date with 'git rebase -i --exec="sleep 2" >> --force-rebase @~2' and test the committer dates of the rebased >> commits. I'm not sure if test -gt can cope with numbers that big >> though, maybe we'll have to be content with test !=. For 'git commit' >> I think doing GIT_EDITOR='sleep 2; echo message >"$1"' and checking >> the committer date and author date will work as the author date is set >> before the user edits the commit message. I'm not sure how to test >> callers of commit_tree() though (that's commit-tree, notes and merge) >> as I've not been able to come up with anything that will guarantee the >> author and committer dates are different if the code in >> commit_tree_extended() that ensures they are the same gets broken. > > The behavior you're describing where we end up with later commits in the > rebase with earlier CommitDate's definitely sounds like a minor > regression, and yeah we should have tests for this. > > My mental model of this is that we shouldn't be trying at all to adjust > the CommitDate in a sequence to be the same, and just make it be > whatever time() returns, except in the case where a date is passed > explicitly. > > My cursory reading of this RFC patch is that it's definitely an > improvement because we don't end up with things out of order, but is > there any reason for why we should be trying to aim to keep this > "consistent" within a single "git rebase" command by default, as opposed > to always just writing the current CommitDate at the time we make the > commit, that sounds like the most intuitive thing to me, and I can't see > any downsides with that. It's not trying to keep the date "consistent" within a single rebase command, each commit created by the sequencer gets a date stamp with the current time when the commit is created. What it is doing is keeping the author and committer dates the same for commit/commit-tree/merge/notes when the user does not specify either of them. While I don't think it particularly matters that they match (so long as the committer date is later than the author date), it is what git does at the moment and someone maybe relying on the current behavior. Best Wishes Phillip > > It leaks info about how long it took someone to do the rebase, but so > what? >
