efcd3168a2f2053597ac467d53f254500de6c1ed - gerrit

commit	efcd3168a2f2053597ac467d53f254500de6c1ed	[log] [tgz]
author	Shawn Pearce <sop@google.com>	Wed Aug 20 14:40:59 2014 -0700
committer	Shawn Pearce <sop@google.com>	Wed Aug 20 14:56:10 2014 -0700
tree	c0b8ed9f4072e4809e1d676e876bce05af931a7d
parent	85a8f993ed1ff16660f13e607db37109b91470d9 [diff]

Fix stale dates in committer field

The server's PersonIdent cannot be held by a singleton such as
SubmitStrategyFactory.  Holding it would retain the timestamp of the
first merge in this process, with the time forever stuck in the past.

Instead use Provider<PersonIdent> so Guice can defer creation of
the server's identity until it is required to write a new commit.
This allows the current date to be injected into a newly created
PersonIdent, keeping the committer field current.

Bug: issue 2773
Change-Id: I9e5edd41e42a702ed8541cfef57660204a8c5b57

gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeAlways.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeIfNecessary.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategy.java[diff]
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java[diff]

6 files changed