From 7292804c1bafd43389defc0d7b4352ada666d626 Mon Sep 17 00:00:00 2001 From: Adam Spragg Date: Wed, 18 May 2022 16:35:35 +0100 Subject: Add ability to not save mtime in metadata files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you're storing metadata in a version control system with multiple branches, mtime differences are going to produce a whole bunch of conflicts that you likely don't care about. This allows you to not save mtime and avoid those. Note that we use a sentinel value of -1 for the mentry `mtimensec` field to indicate this in the data, as all values of `mtime` are theoretically valid, but `mtimensec` must always be between 0 and 999,999,999 in the real world. I'm not 100% sure about the mechanism for selecting this feature. The legacy behaviour for metastore was to save mtimes in the metadata files, but ignore them for compare/apply by default, with a `--mtime` option to use the mtime data. Keeping the legacy behaviour for backwards compatibility, but adding a `--no-mtime` option to ignore mtimes when saving felt like a reasonable way of making this happen, but something about it doesn't feel great. Maybe I just didn't figure out how to make the documentation clear enough. ¯\_(ツ)_/¯ --- src/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index 048f281..fd0a0a3 100644 --- a/src/settings.h +++ b/src/settings.h @@ -23,7 +23,7 @@ /* Data structure to hold metastore settings */ struct metasettings { char *metafile; /* path to the file containing the metadata */ - bool do_mtime; /* should mtimes be corrected? */ + int do_mtime; /* deal with mtimes? -1 = no, 0 = default, 1 = yes */ bool do_emptydirs; /* should empty dirs be recreated? */ bool do_removeemptydirs; /* should new empty dirs be removed? */ bool do_git; /* should .git dirs be processed? */ -- cgit v1.2.1