On Jun 10, 2014, at 10:45 AM, Chuck Lever <[email protected]> wrote:
> Following up. > > > On Jun 4, 2014, at 9:53 AM, Chuck Lever <[email protected]> wrote: > >> Hi Catalin- >> >> 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 did a little comparison, fwiw. >> >> git://git.linux-nfs.org/projects/cel/fedfs-utils.git >> >> I manage this repo from a newer system: >> >> [cel@seurat ~]$ stg --version >> Stacked GIT 0.16 >> git version 1.8.3.1 >> Python version 2.7.5 (default, Nov 12 2013, 16:18:42) >> [GCC 4.8.2 20131017 (Red Hat 4.8.2-1)] >> [cel@seurat ~]$ >> >> It appears to retain unique author dates. >> >> This repo: >> >> git://git.linux-nfs.org/projects/cel/cel-2.6.git >> >> I’m managing currently from OL6 using the stgit packaged >> in EPEL: >> >> [cel@manet linux-2.6]$ stg --version >> Stacked GIT 0.14.3 >> git version 1.7.1 >> Python version 2.6.6 (r266:84292, Jan 22 2014, 01:49:05) >> [GCC 4.4.7 20120313 (Red Hat 4.4.7-4)] >> [cel@manet linux-2.6]$ >> >> A cursory check against www.kernel.org shows the author dates >> in my “master” branch match master upstream. But in the >> nfs-rdma-client branch, which I maintain, authdates all appear >> to be the same as the commit date. >> >> The “for-3.12” branch in this repo was managed with a version >> of git/stgit similar to the fedfs-utils repo above, and the >> authdates appear to be preserved. > > I updated git and stgit on my current OL6 test system to match what > I have on the Fedora 19 system. stgit is now version 0.16. > > These subcommands now preserve authdate: refresh, push, pop > > These subcommands do not preserve authdate: pick -B, rebase It was pointed out to me that breaking out the pop and push steps preserves authdates: $ stg pop -a $ stg rebase yada $ stg push -a Seems to work correctly. > stg import is not working for other reasons, so I couldn’t test it. > It seems to get crabby about importing raw e-mail from Mail.app. > Ideally it should pick up the authdate from the e-mail’s Date: header. > > I applied the patch you suggested above. No change for my test cases. -- Chuck Lever chuck[dot]lever[at]oracle[dot]com _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
