From: Ben Peart <peartben@gmail.com>
To: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Cc: Ben.Peart@microsoft.com, avarab@gmail.com, gitster@pobox.com
Subject: Re: [PATCH] git-mv: allow submodules and fsmonitor to work together
Date: Mon, 10 Sep 2018 11:58:41 -0400 [thread overview]
Message-ID: <85d96d65-2e74-7877-80ab-f74fdb81d500@gmail.com> (raw)
In-Reply-To: <20180906203444.162213-1-sbeller@google.com>
On 9/6/2018 4:34 PM, Stefan Beller wrote:
> It was reported that
>
> GIT_FSMONITOR_TEST=$PWD/t7519/fsmonitor-all ./t7411-submodule-config.sh
>
> breaks as the .gitmodules file is modified and staged after the fsmonitor
> considers it clean. Mark the .gitmodules file to be not clean before
> staging.
>
> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Inspired-by: Ben Peart <benpeart@microsoft.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>
> I am not quite sure if this is the correct approach and handling of the
> fsmonitor API, but it unbreaks the test.
>
>> Just naively adding mark_fsmonitor_invalid doesn't work, as then ...
>
> Adding it before the staging, works.
>
> Please double check!
I took a look at this bug/patch and wondered why add_file_to_index()
wasn't properly handling the .gitmodules file. On investigation, I
chased it down to what looks like a faulty test in
is_staging_gitmodules_ok().
I believe the following is a better patch for this bug:
diff --git a/submodule.c b/submodule.c
index 50cbf5f13e..1e7194af28 100644
--- a/submodule.c
+++ b/submodule.c
@@ -65,8 +65,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
if ((pos >= 0) && (pos < istate->cache_nr)) {
struct stat st;
if (lstat(GITMODULES_FILE, &st) == 0 &&
- ie_match_stat(istate, istate->cache[pos], &st,
- CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
+ ie_match_stat(istate, istate->cache[pos], &st, 0) &
DATA_CHANGED)
return 0;
}
Please double check but I just don't understand why the .gitmodules file
should force the fsmonitor data to be ignored. This flag was added to
enable proper behavior in the preload_thread() logic and I don't believe
it is appropriate here.
Ben
>
> Thanks,
> Stefan
>
> submodule.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/submodule.c b/submodule.c
> index 50cbf5f13ed..56b0d5fe24e 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -22,6 +22,7 @@
> #include "worktree.h"
> #include "parse-options.h"
> #include "object-store.h"
> +#include "fsmonitor.h"
>
> static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
> static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP;
> @@ -149,6 +150,15 @@ int remove_path_from_gitmodules(const char *path)
>
> void stage_updated_gitmodules(struct index_state *istate)
> {
> + struct cache_entry *ce;
> + int pos;
> +
> + pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
> + ce = (0 <= pos) ? istate->cache[pos] : NULL;
> +
> + if (ce)
> + mark_fsmonitor_invalid(istate, ce);
> +
> if (add_file_to_index(istate, GITMODULES_FILE, 0))
> die(_("staging updated .gitmodules failed"));
> }
>
next prev parent reply other threads:[~2018-09-10 15:58 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 6:01 What's cooking in git.git (May 2018, #02; Thu, 17) Junio C Hamano
2018-05-17 6:39 ` jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17)) Kaartic Sivaraam
2018-05-17 9:48 ` Ævar Arnfjörð Bjarmason
2018-05-17 11:00 ` Kaartic Sivaraam
2018-05-17 12:02 ` Ævar Arnfjörð Bjarmason
2018-05-17 13:36 ` Jeff King
2018-05-24 15:10 ` Kaartic Sivaraam
2018-05-24 19:22 ` Jeff King
2018-05-24 19:31 ` [PATCH] branch: issue "-l" deprecation warning after pager starts Jeff King
2018-05-25 1:55 ` Junio C Hamano
2018-05-25 2:40 ` Jeff King
2018-05-25 8:56 ` Junio C Hamano
2018-05-25 9:14 ` Junio C Hamano
2018-05-25 17:10 ` Jeff King
2018-05-26 2:37 ` Junio C Hamano
2018-05-25 21:00 ` [RFC PATCH 0/3] usage: prefix all lines in `vreportf()`, not just the first Martin Ågren
2018-05-25 21:00 ` [RFC PATCH 1/3] usage: extract `prefix_suffix_lines()` from `advise()` Martin Ågren
2018-05-28 8:27 ` Junio C Hamano
2018-05-28 18:40 ` Duy Nguyen
2018-05-29 21:33 ` Jeff King
2018-05-29 21:39 ` Jeff King
2018-05-30 1:42 ` Junio C Hamano
2018-05-30 6:00 ` Junio C Hamano
2018-05-30 10:26 ` Martin Ågren
2018-05-31 6:07 ` Jeff King
2018-05-25 21:00 ` [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first Martin Ågren
2018-05-28 9:25 ` Junio C Hamano
2018-05-28 18:45 ` Duy Nguyen
2018-05-28 21:45 ` Junio C Hamano
2018-05-29 4:49 ` Martin Ågren
2018-05-29 5:50 ` Junio C Hamano
2018-05-29 10:30 ` Martin Ågren
2018-05-29 12:08 ` Junio C Hamano
2018-05-29 15:50 ` Duy Nguyen
2018-05-30 10:19 ` Martin Ågren
2018-05-29 21:32 ` Jeff King
2018-05-30 10:20 ` Martin Ågren
2018-05-25 21:00 ` [RFC PATCH 3/3] usage: translate the "error: "-prefix and others Martin Ågren
2018-05-26 2:32 ` [PATCH] branch: issue "-l" deprecation warning after pager starts Junio C Hamano
2018-05-26 2:33 ` Junio C Hamano
2018-05-29 21:20 ` Jeff King
2018-05-29 21:21 ` Jeff King
2018-05-30 2:48 ` Junio C Hamano
2018-05-31 5:44 ` Jeff King
2018-05-26 19:39 ` Kaartic Sivaraam
2018-06-02 4:46 ` Duy Nguyen
2018-06-02 8:10 ` Jeff King
2018-05-26 18:45 ` Kaartic Sivaraam
2018-05-29 21:15 ` Jeff King
2018-05-30 2:52 ` Junio C Hamano
2018-05-31 5:51 ` Jeff King
2018-06-01 1:35 ` Junio C Hamano
2018-05-31 5:52 ` Kaartic.Sivaraam
2018-05-17 13:22 ` What's cooking in git.git (May 2018, #02; Thu, 17) Derrick Stolee
2018-05-17 18:20 ` Stefan Beller
2018-05-17 18:29 ` [PATCH 0/2] Reroll 2 last commits of sb/object-store-replace Stefan Beller
2018-05-17 18:29 ` [PATCH 1/2] object.c: free replace map in raw_object_store_clear Stefan Beller
2018-05-17 18:29 ` [PATCH 2/2] replace-object.c: remove the_repository from prepare_replace_object Stefan Beller
2018-05-17 18:40 ` [PATCH] merge-recursive: give notice when submodule commit gets fast-forwarded Stefan Beller
2018-05-18 19:43 ` [PATCH v2 0/1] rebased: inform about auto submodule ff Leif Middelschulte
2018-05-18 19:48 ` [PATCH v3 " Leif Middelschulte
2018-05-18 19:48 ` [PATCH 1/1] Inform about fast-forwarding of submodules during merge Leif Middelschulte
2018-05-18 21:25 ` Elijah Newren
2018-05-21 4:12 ` Junio C Hamano
2018-05-17 19:46 ` [PATCH 0/8] Reroll of sb/diff-color-move-more Stefan Beller
2018-05-17 19:46 ` [PATCH 1/8] xdiff/xdiff.h: remove unused flags Stefan Beller
2018-05-17 19:46 ` [PATCH 2/8] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-05-17 19:46 ` [PATCH 3/8] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-05-17 19:46 ` [PATCH 4/8] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-05-17 19:46 ` [PATCH 5/8] diff.c: add a blocks mode for moved code detection Stefan Beller
2018-05-17 19:46 ` [PATCH 6/8] diff.c: decouple white space treatment from move detection algorithm Stefan Beller
2018-05-18 4:00 ` Simon Ruderich
2018-05-18 19:25 ` Stefan Beller
2018-05-17 19:46 ` [PATCH 7/8] diff.c: add --color-moved-ignore-space-delta option Stefan Beller
2018-05-17 19:46 ` [PATCH 8/8] diff: color-moved white space handling options imply color-moved Stefan Beller
2018-05-17 22:53 ` [PATCH 0/8] Reroll of sb/diff-color-move-more Jonathan Tan
2018-06-07 23:54 ` Jacob Keller
2018-05-17 22:36 ` What's cooking in git.git (May 2018, #02; Thu, 17) Junio C Hamano
2018-05-17 22:39 ` Stefan Beller
2018-05-17 22:56 ` Junio C Hamano
2018-05-17 22:58 ` Stefan Beller
2018-05-21 1:57 ` brian m. carlson
2018-05-21 17:36 ` Stefan Beller
2018-05-25 12:28 ` sb/submodule-move-nested breaks t7411 under GIT_FSMONITOR_TEST Ævar Arnfjörð Bjarmason
2018-05-25 17:27 ` Stefan Beller
2018-05-25 19:49 ` Stefan Beller
2018-09-06 12:31 ` Ævar Arnfjörð Bjarmason
2018-09-06 16:57 ` Stefan Beller
2018-09-06 19:03 ` Ben Peart
2018-09-06 20:14 ` Stefan Beller
2018-09-06 20:34 ` [PATCH] git-mv: allow submodules and fsmonitor to work together Stefan Beller
2018-09-10 15:58 ` Ben Peart [this message]
2018-09-10 16:29 ` [PATCH v1] " Ben Peart
2018-09-10 17:07 ` Stefan Beller
2018-09-10 19:38 ` Ben Peart
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=85d96d65-2e74-7877-80ab-f74fdb81d500@gmail.com \
--to=peartben@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/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.
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 NNTP newsgroup(s).