git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 04/23] untracked cache: invalidate dirs recursively if .gitignore changes
Date: Mon,  8 Dec 2014 21:04:48 +0700	[thread overview]
Message-ID: <1418047507-22892-6-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1418047507-22892-1-git-send-email-pclouds@gmail.com>

It's easy to see that if an existing .gitignore changes, its SHA-1
would be different and invalidate_gitignore() is called.

If .gitignore is removed, add_excludes() will treat it like an empty
.gitignore, which again should invalidate the cached directory data.

if .gitignore is added, lookup_untracked() already fills initial
.gitignore SHA-1 as "empty file", so again invalidate_gitignore() is
called.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 dir.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/dir.c b/dir.c
index 44ed9f2..6e91315 100644
--- a/dir.c
+++ b/dir.c
@@ -1010,7 +1010,23 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
 			add_excludes(el->src, el->src, stk->baselen, el, 1,
 				     untracked ? &sha1_stat : NULL);
 		}
-		if (untracked) {
+		/*
+		 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
+		 * will first be called in valid_cached_dir() then maybe many
+		 * times more in last_exclude_matching(). When the cache is
+		 * used, last_exclude_matching() will not be called and
+		 * reading .gitignore content will be a waste.
+		 *
+		 * So when it's called by valid_cached_dir() and we can get
+		 * .gitignore SHA-1 from the index (i.e. .gitignore is not
+		 * modified on work tree), we could delay reading the
+		 * .gitignore content until we absolutely need it in
+		 * last_exclude_matching(). Be careful about ignore rule
+		 * order, though, if you do that.
+		 */
+		if (untracked &&
+		    hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) {
+			invalidate_gitignore(dir->untracked, untracked);
 			hashcpy(untracked->exclude_sha1, sha1_stat.sha1);
 		}
 		dir->exclude_stack = stk;
-- 
2.2.0.60.gb7b3c64

  parent reply	other threads:[~2014-12-08 13:55 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-08 14:04 [PATCH v3 00/23] nd/untracked-cache updates Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH] checkout: add --ignore-other-wortrees Nguyễn Thái Ngọc Duy
2014-12-08 13:58   ` Duy Nguyen
2014-12-08 14:04 ` [PATCH v3 01/23] dir.c: optionally compute sha-1 of a .gitignore file Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 02/23] untracked cache: record .gitignore information and dir hierarchy Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 03/23] untracked cache: initial untracked cache validation Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` Nguyễn Thái Ngọc Duy [this message]
2014-12-08 14:04 ` [PATCH v3 05/23] untracked cache: make a wrapper around {open,read,close}dir() Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 06/23] untracked cache: record/validate dir mtime and reuse cached output Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 07/23] untracked cache: mark what dirs should be recursed/saved Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 08/23] untracked cache: don't open non-existent .gitignore Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 09/23] ewah: add convenient wrapper ewah_serialize_strbuf() Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 10/23] untracked cache: save to an index extension Nguyễn Thái Ngọc Duy
2014-12-09 23:28   ` Eric Sunshine
2014-12-10  0:21   ` Duy Nguyen
2014-12-08 14:04 ` [PATCH v3 11/23] untracked cache: load from UNTR " Nguyễn Thái Ngọc Duy
2014-12-15 19:35   ` Junio C Hamano
2014-12-08 14:04 ` [PATCH v3 12/23] untracked cache: invalidate at index addition or removal Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 13/23] read-cache.c: split racy stat test to a separate function Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 14/23] untracked cache: avoid racy timestamps Nguyễn Thái Ngọc Duy
2014-12-08 14:04 ` [PATCH v3 15/23] untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 16/23] untracked cache: mark index dirty if untracked cache is updated Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 17/23] untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 18/23] status: enable untracked cache Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 19/23] update-index: manually enable or disable " Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 20/23] update-index: test the system before enabling " Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 21/23] t7063: tests for " Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 22/23] mingw32: add uname() Nguyễn Thái Ngọc Duy
2014-12-08 14:05 ` [PATCH v3 23/23] untracked cache: guard and disable on system changes Nguyễn Thái Ngọc Duy
2014-12-09 10:04   ` brian m. carlson
2014-12-09 22:53     ` Duy Nguyen
2014-12-10  5:08       ` Torsten Bögershausen
2014-12-10 12:22         ` Duy Nguyen
2014-12-11 20:41           ` Torsten Bögershausen
2014-12-15  3:02             ` Duy Nguyen

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=1418047507-22892-6-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    /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).