On Jun 4, 2014, at 5:50 AM, Catalin Marinas <[email protected]> wrote:
> On 4 June 2014 00:04, Chuck Lever <[email protected]> wrote: >> I recently noticed that after "stg rebase", the commit date and author >> date in all patches in the rebased branch are now the same. How can >> I retain the original author date when performing stgit operations? > > I think this needs fixing in stgit, there is no option. Basically > refresh assumes that the author date needs to be updated to the latest > and this also has implications on rebase. Something like below, > untested, but we need to assess what other cases are affected: > > diff --git a/stgit/stack.py b/stgit/stack.py > index 9cd43a3e8809..15ab1879ef6e 100644 > --- a/stgit/stack.py > +++ b/stgit/stack.py > @@ -706,6 +706,8 @@ class Series(PatchSet): > author_name = patch.get_authname() > if not author_email: > author_email = patch.get_authemail() > + if not author_date: > + author_date = patch.get_authdate() > if not committer_name: > committer_name = patch.get_commname() > if not committer_email: I applied this to 0.17.1, and it seems to do the right thing for "stg rebase” and “stg pick”. -- Chuck Lever chuck[dot]lever[at]oracle[dot]com _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
