From: "Robin H. Johnson" <robbat2@gentoo.org>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Robin H. Johnson" <robbat2@gentoo.org>,
"Git Mailing List" <git@vger.kernel.org>,
"Michał Górny" <mgorny@gentoo.org>, "Jeff King" <peff@peff.net>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [RFC PATCH] checkout: Force matching mtime between files
Date: Wed, 25 Apr 2018 20:07:11 +0000 [thread overview]
Message-ID: <robbat2-20180425T173507-286694375Z@orbis-terrarum.net> (raw)
In-Reply-To: <ad4d0d66-58f4-5cab-d314-a30a50e8ad32@xiplink.com>
On Wed, Apr 25, 2018 at 11:18:26AM -0400, Marc Branchaud wrote:
> > The best approach to do so is to have those people do the "touch"
> > thing in their own post-checkout hook. People who use Git as the
> > source control system won't have to pay runtime cost of doing the
> > touch thing, and we do not have to maintain such a hook script.
> > Only those who use the "feature" would.
>
> The post-checkout hook approach is not exactly straightforward.
>
> Naively, it's simply
>
> for F in `git diff --name-only $1 $2`; do touch "$F"; done
Even this naive attempt gets it wrong: successive files have increasing
times. You need to capture the time at the start, and use it as the time
for the files.
touch /tmp/ref && \
for F in `git diff --name-only $1 $2`; do touch -r /tmp/ref "$F"; done && \
rm /tmp/ref
(or pass a fixed time into touch).
> But consider:
>
> * Symlinks can cause the wrong file to be touched. (Granted, Michał's
> proposed patch also doesn't deal with symlinks.)
Yes, it blindly touches the file, and rather than trying to do
utimensat's AT_SYMLINK_NOFOLLOW flag.
> Let's assume that a
> hook can be crafted will all possible sophistication. There are still
> some fundamental problems:
>
> * In a "file checkout" ("git checkout -- path/to/file"), $1 and $2 are
> identical so the above loop does nothing. Offhand I'm not even sure how
> a hook might get the right files in this case.
Yes, this would need to be a new hook that knows more than post-checkout
presently does.
post-checkout right now runs AFTER the worktree has been updated, and
only gets the refs of old/new HEAD and if the branch was changed.
It does NOT know which files were actually modified, and since it
If a hook is added for that, then this behavior can be implemented in
the hook. Alternatively adding a pre-checkout hook to absorb some state
of the unmodified worktree (this could be a bit expensive).
> * The hook has to be set up in every repo and submodule (at least until
> something like Ævar's experiments come to fruition).
>
> * A fresh clone can't run the hook. This is especially important when
> dealing with submodules. (In one case where we were bit by this, make
> though that half of a fresh submodule clone's files were stale, and
> decided to re-autoconf the entire thing.)
The fresh clone case really matters for my usage, where new clones are
firing in CI/CD processes.
> I just don't think the hook approach can completely solve the problem.
>
> I appreciate Ævar's concern that there are more than just two mtime
> requests floating around. But I think git's users are best served by a
> built-in approach, with a config setting to control the desired mtime
> handling (defaulting to the current behaviour). People who want a
> different mtime solution will at least have a clear place in the code to
> propose a patch.
+1 as long as we can set the behavior during the clone.
--
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation Treasurer
E-Mail : robbat2@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136
next prev parent reply other threads:[~2018-04-25 20:07 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-13 17:01 [RFC PATCH] checkout: Force matching mtime between files Michał Górny
2018-04-23 20:07 ` Robin H. Johnson
2018-04-23 23:41 ` Junio C Hamano
2018-04-25 7:13 ` Robin H. Johnson
2018-04-25 8:48 ` Junio C Hamano
2018-04-25 15:18 ` Marc Branchaud
2018-04-25 20:07 ` Robin H. Johnson [this message]
2018-04-26 1:25 ` Junio C Hamano
2018-04-26 14:12 ` Marc Branchaud
2018-04-26 14:46 ` Michał Górny
2018-04-28 14:23 ` Duy Nguyen
2018-04-28 19:35 ` Michał Górny
2018-04-26 16:43 ` Duy Nguyen
2018-04-26 17:48 ` Robin H. Johnson
2018-04-26 18:44 ` Duy Nguyen
2018-04-29 23:56 ` Junio C Hamano
2018-04-30 15:10 ` Duy Nguyen
2018-04-27 17:03 ` Duy Nguyen
2018-04-27 21:08 ` Elijah Newren
2018-04-28 6:08 ` Duy Nguyen
2018-04-29 23:47 ` Junio C Hamano
2018-04-27 21:08 ` Marc Branchaud
2018-04-28 6:16 ` Duy Nguyen
2018-04-27 17:18 ` Michał Górny
2018-04-27 19:53 ` Ævar Arnfjörð Bjarmason
2018-04-25 8:41 ` Ævar Arnfjörð Bjarmason
2018-04-26 17:15 ` Duy Nguyen
2018-04-26 17:51 ` Robin H. Johnson
2018-04-26 17:53 ` SZEDER Gábor
2018-04-26 18:45 ` Duy Nguyen
2018-04-24 14:41 ` Marc Branchaud
2018-04-25 6:58 ` Robin H. Johnson
2018-04-25 7:13 ` Michał Górny
2018-05-05 18:44 ` Jeff King
2018-05-06 3:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=robbat2-20180425T173507-286694375Z@orbis-terrarum.net \
--to=robbat2@gentoo.org \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=marcnarc@xiplink.com \
--cc=mgorny@gentoo.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).