From nobody Fri Nov 19 14:37:57 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1557F18A7D16 for ; Fri, 19 Nov 2021 14:37:59 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HwfQt6s3tz4sGH; Fri, 19 Nov 2021 14:37:58 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mail-qv1-xf34.google.com with SMTP id i13so7228177qvm.1; Fri, 19 Nov 2021 06:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=U0DfhyivVfQxIA4csw0O1GaVCWND51pmdepOFsPGROw=; b=bQu3T9OAW1SuxbkaRXPLD1aQsAIkPrfoI033P9t9aC+J/MXsxD8wxvd96Nh85Oscuo FJYKP6ZmzXYuz/nBFC5vddsk3sjYC02pmogbPF2ac3vZLCPg3NEL+zLvDA1bhUJcx2U6 EnLFmrLL0zyuxKMmrYQPuzhJN4pIC+u1yMgiM+36hk6BiHlTqArPD/tlr0d5sH51GjIT hq1nre1ckqs7YYr3PGjWYOlew46kGafUpM0SRYeBK/0QqkO5DB4I7c9S1t+WQC5ksDjZ 2hkUIsNZYMzyeraQiW6vCQFAHj/OmNqzIvGAOi3qWH7Pk1oHiubjX+Q70CkN+MuQ6K6X rmXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=U0DfhyivVfQxIA4csw0O1GaVCWND51pmdepOFsPGROw=; b=tKQShP8jWdIXrLLE6asNLlvgNcXjftQvH/J32RY0KkvFFzS9GljuDWewETNxWWXaA5 dOuxJ7G0WazomJLozmgIrh9dz+18wSA6CTmJDQrQvD/MxnajTdKywdHvO9ei7oC4nczT Lh6wpvRZLeSBNKFhGB5XBZsjx214tuud8FbgOKuvEslh4Fixt2AczK2ezu9aGjM7zRwa Fbqk933NKjFS9IBOTOoFn4EC7wa1THnkvUy/uyh6YQmTq7OyevFv/gtL1U3IoRpLOnoG S389Z1IDLPrP6wiXTP4ROej2yqmyxXvR6VpgLPUAeVBYjurx+PAAaqh+dSkqWVi0LPqx eI/g== X-Gm-Message-State: AOAM530vcoLFu3rrydSAIQccfM0V2KTLSqcAFLZiYUuK/tCTjKFpLYeB 8xJfN3IvFt9GL+uFl/GDIFpdjnFZyUM= X-Google-Smtp-Source: ABdhPJx+H+064oRDobM2ny+nZ6wnR5c7SUy1ioAY5+T4e6GyP+Hc055BhCT7Sc9iKEVdwbGsHkkKqQ== X-Received: by 2002:ad4:5ae5:: with SMTP id c5mr74315371qvh.29.1637332678606; Fri, 19 Nov 2021 06:37:58 -0800 (PST) Received: from [192.168.222.18] (192-222-183-158.qc.cable.ebox.net. [192.222.183.158]) by smtp.gmail.com with ESMTPSA id q20sm1723852qkl.53.2021.11.19.06.37.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 06:37:58 -0800 (PST) Message-ID: <58e89a2f-f53e-1b41-138f-e2d0fd536a28@gmail.com> Date: Fri, 19 Nov 2021 09:37:57 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.1 Subject: Re: cgit, ages and chronological order Content-Language: en-US To: Warner Losh , Brooks Davis Cc: Philip Paeps , Mark Millard , Ulrich Sp??rlein , Graham Perrin , freebsd-git References: <9766b3e1-fb5d-1993-46e2-057e2567315a@gmail.com> <36020FD7-32A4-4869-B6A2-2622F50F6478@yahoo.com> <20211118162927.GG81740@spindle.one-eyed-alien.net> From: Marc Branchaud In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4HwfQt6s3tz4sGH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On 2021-11-18 11:46, Warner Losh wrote: > On Thu, Nov 18, 2021 at 9:29 AM Brooks Davis wrote: > >> On Thu, Nov 18, 2021 at 12:46:49PM +0800, Philip Paeps wrote: >>> On 2021-11-17 06:32:52 (+0800), Mark Millard via freebsd-git wrote: >>>> information being based on local git commit timing (and clocks) >>>> vs. when the commits are pushed to FreeBSD servers: The display >>>> order is from the timing on the FreeBSD servers but the Age is >>>> based on the original commit (before the push). The longer the >>>> delay between commit and push, the more noticeable the >>>> distinction is. >>> >>> Some projects require a "git rebase --ignore-date" (or "git rebase >>> --reset-author-date", which I consider the more obvious spelling) before >>> pushing. A hook could potentially reject commits with timestamps that >>> are too far off to the server's liking. >>> >>> I can't comment on whether we need or want either the policy or the hook >>> or both. I don't really have a problem with the default Git behaviour >>> here. >> >> I always use --ignore-date when curating pre-commit. I'd like to at >> an absolute minimum enforce that CommitDate be newer than the previous >> commit and older than the push time. There is no good argument for >> allowing non-linear CommitDates since the only requirement is that the >> committer have their clock set more or less correctly. >> > > At the very least, we should document this suggestion. > > I also like the idea of enforcing this as a pre-commit hook, but before that > we should have it the docs... wouldn't hurt to have a section in the docs > about each of the major points we enforce to tell people have to fix > the issue should they encounter it. A Git alias could be a useful recommendation here, eg. to create a "git rb" command that does a rebase with the desired option: git config --add alias.rb 'rebase --ignore-date' (Add --local to make Git only configure the alias for your FreeBSD clone.) I think maybe you can even create a "rebase" alias that overlays the real "rebase" Git command, but I'm not 100% sure of that (I don't like to mask the real Git commands with my aliases, so I've never tried). M.