From 1ddaf7a27f68a33df22d629951c5d7d3a7cf11ac Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jun 2022 14:00:56 -0400 Subject: [PATCH] decided this is not a problem --- doc/bugs/worktree_overwrite_races.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/bugs/worktree_overwrite_races.mdwn b/doc/bugs/worktree_overwrite_races.mdwn index 78fdf1addd..c0fa11683f 100644 --- a/doc/bugs/worktree_overwrite_races.mdwn +++ b/doc/bugs/worktree_overwrite_races.mdwn @@ -15,3 +15,18 @@ Better would probably be for replaceWorkTreeFile to be provided with a InodeCache of the content of the worktree file that is ok to replace. Then it can move the file to a temp directory, check that it's still unmodified, and replace it. --[[Joey]] + +> On second thought, I remember that I investigated git's behavior before +> when a checkout or pull is updating the worktree and a file is changed. +> git does not avoid races, and can overwrite user modifications. Last time +> I looked at this, I remember I decided that if git did that, it was ok +> for git-annex to also. +> +> The difference with [[add_overwrite_race]] is it caused the wrong thing +> to get added to git, which is a problem that `git add` does not have +> (probably). And git-annex already took steps to deal with writes that +> happened in the middle of a `git-annex add`. So it made sense to fix +> those problems. But extending it to this broader case is not necessary, I +> think. +> +> [[done]] --[[Joey]] -- 2.30.2