From: Junio C Hamano <gitster@pobox•com>
To: Duy Nguyen <pclouds@gmail•com>
Cc: David Turner <dturner@twopensource•com>,
Git Mailing List <git@vger•kernel.org>,
David Turner <dturner@twitter•com>
Subject: Re: [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit
Date: Tue, 08 Jul 2014 12:15:06 -0700 [thread overview]
Message-ID: <xmqq61j7achx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CACsJy8C20oFdATHKTLK=9U3_kHu1QsuS4i74RPgQn0aTwVCC8w@mail.gmail.com> (Duy Nguyen's message of "Tue, 8 Jul 2014 17:32:20 +0700")
Duy Nguyen <pclouds@gmail•com> writes:
> Writing cache tree early in prepare_index() does help hooks, but I
> would say hooks are uncommon case and we could add an option to
> update-index to explicitly rebuild cache-tree, then hooks that do diff
> a lot (or other operations that use cache-tree) could rebuild
> cache-tree by themselves.
Yes, "update-index --update-cache-tree" would be a good addition for
completeness; scripts working with plumbing should be able to do
what built-in Porcelains can. They can of course do "write-tree" in
the meantime so I do not see it as a very high priority, though.
This should apply on top of 'master', and if the series under
discussion turns out to be a good idea, the new call to
update-main-cache-tree I added to this code path should use the
option added by the series that only repairs parts of cache-trees
that can be repaird without writing out new trees, so it is just to
give hints to future people (iow I am not going to apply this patch
myself right now).
builtin/update-index.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index ebea285..1ce2274 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -26,6 +26,7 @@ static int allow_remove;
static int allow_replace;
static int info_only;
static int force_remove;
+static int update_cache_tree;
static int verbose;
static int mark_valid_only;
static int mark_skip_worktree_only;
@@ -762,6 +763,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "unmerged", &refresh_args.flags,
N_("refresh even if index contains unmerged entries"),
REFRESH_UNMERGED),
+ OPT_BOOL(0, "update-cache-tree", &update_cache_tree,
+ N_("update cache-tree before writing the result out")),
{OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
N_("refresh stat information"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
@@ -918,6 +921,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
}
+ if (update_cache_tree && !unmerged_cache()) {
+ update_main_cache_tree(0);
+ active_cache_changed = 1; /* force write-out */
+ }
+
if (active_cache_changed) {
if (newfd < 0) {
if (refresh_args.flags & REFRESH_QUIET)
next prev parent reply other threads:[~2014-07-08 19:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-06 4:06 [PATCH v4 1/4] cache-tree: Create/update cache-tree on checkout David Turner
2014-07-06 4:06 ` [PATCH v4 2/4] test-dump-cache-tree: invalid trees are not errors David Turner
2014-07-07 19:27 ` Junio C Hamano
2014-07-06 4:06 ` [PATCH v4 3/4] cache-tree: subdirectory tests David Turner
2014-07-06 8:10 ` Eric Sunshine
2014-07-07 19:15 ` Junio C Hamano
2014-07-06 4:06 ` [PATCH v4 4/4] cache-tree: Write updated cache-tree after commit David Turner
2014-07-07 20:03 ` Junio C Hamano
2014-07-08 0:26 ` Junio C Hamano
2014-07-08 10:32 ` Duy Nguyen
2014-07-08 17:05 ` Junio C Hamano
2014-07-09 1:58 ` Duy Nguyen
2014-07-08 18:32 ` Junio C Hamano
2014-07-08 19:15 ` Junio C Hamano [this message]
2014-07-07 18:58 ` [PATCH v4 1/4] cache-tree: Create/update cache-tree on checkout 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq61j7achx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twitter$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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