From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
yuri.kanivetsky@gmail.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v4 0/4] cache-tree building fix in the presence of ita entries
Date: Sat, 16 Jul 2016 07:06:23 +0200 [thread overview]
Message-ID: <20160716050627.9416-1-pclouds@gmail.com> (raw)
In-Reply-To: <20160709052356.30570-1-pclouds@gmail.com>
v4 removes the leading underscore from _EMPTY_BLOB and _EMPTY_TREE and
updates 4/4 slightly like this.
diff --git a/cache-tree.c b/cache-tree.c
index 2d50640..f28b1f4 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -325,6 +325,7 @@ static int update_one(struct cache_tree *it,
const unsigned char *sha1;
unsigned mode;
int expected_missing = 0;
+ int contains_ita = 0;
path = ce->name;
pathlen = ce_namelen(ce);
@@ -341,7 +342,8 @@ static int update_one(struct cache_tree *it,
i += sub->count;
sha1 = sub->cache_tree->sha1;
mode = S_IFDIR;
- if (sub->cache_tree->entry_count < 0) {
+ contains_ita = sub->cache_tree->entry_count < 0;
+ if (contains_ita) {
to_invalidate = 1;
expected_missing = 1;
}
@@ -381,10 +383,9 @@ static int update_one(struct cache_tree *it,
}
/*
- * "sub" can be an empty tree if subentries are i-t-a.
+ * "sub" can be an empty tree if all subentries are i-t-a.
*/
- if (sub && sub->cache_tree->entry_count < 0 &&
- !hashcmp(sha1, EMPTY_TREE_SHA1_BIN))
+ if (contains_ita && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN))
continue;
strbuf_grow(&buffer, entlen + 100);
Nguyễn Thái Ngọc Duy (4):
test-lib.sh: introduce and use $EMPTY_TREE
test-lib.sh: introduce and use $EMPTY_BLOB
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
cache-tree: do not generate empty trees as a result of all i-t-a
subentries
cache-tree.c | 14 +++++++++++---
t/t0000-basic.sh | 2 +-
t/t1011-read-tree-sparse-checkout.sh | 8 ++++----
t/t1100-commit-tree-options.sh | 2 +-
t/t1700-split-index.sh | 24 ++++++++++++------------
t/t2203-add-intent.sh | 31 +++++++++++++++++++++++++++++++
t/t3102-ls-tree-wildcards.sh | 8 ++++----
t/t4010-diff-pathspec.sh | 2 --
t/t4054-diff-bogus-tree.sh | 10 ++++------
t/t5504-fetch-receive-strict.sh | 4 ++--
t/t7011-skip-worktree-reading.sh | 12 +++++-------
t/t7012-skip-worktree-writing.sh | 10 ++++------
t/t7063-status-untracked-cache.sh | 6 +++---
t/t7508-status.sh | 2 +-
t/test-lib.sh | 5 ++++-
15 files changed, 87 insertions(+), 53 deletions(-)
--
2.9.1.566.gbd532d4
next prev parent reply other threads:[~2016-07-16 5:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 13:50 Git doesn't always add files to a commit (amend) Yuri Kanivetsky
2016-07-04 15:48 ` Duy Nguyen
2016-07-04 17:48 ` [PATCH] cache-tree.c: fix i-t-a check skipping directory updates sometimes Nguyễn Thái Ngọc Duy
2016-07-06 17:43 ` Junio C Hamano
2016-07-06 17:55 ` Junio C Hamano
2016-07-06 18:48 ` [PATCH v2 0/2] cache-tree building fix in the presence of ita entries Nguyễn Thái Ngọc Duy
2016-07-06 18:48 ` [PATCH v2 1/2] cache-tree.c: fix i-t-a entry skipping directory updates sometimes Nguyễn Thái Ngọc Duy
2016-07-06 18:48 ` [PATCH v2 2/2] cache-tree: do not generate empty trees as a result of all i-t-a subentries Nguyễn Thái Ngọc Duy
2016-07-06 19:26 ` Junio C Hamano
2016-07-07 17:12 ` Duy Nguyen
2016-07-07 18:52 ` Junio C Hamano
2016-07-08 15:39 ` Duy Nguyen
2016-07-08 15:53 ` Junio C Hamano
2016-07-08 16:36 ` Duy Nguyen
2016-07-08 17:23 ` Junio C Hamano
2016-07-09 5:23 ` [PATCH v3 0/4] cache-tree building fix in the presence of ita entries Nguyễn Thái Ngọc Duy
2016-07-09 5:23 ` [PATCH v3 1/4] test-lib.sh: introduce and use $_EMPTY_TREE Nguyễn Thái Ngọc Duy
2016-07-12 20:40 ` Junio C Hamano
2016-07-13 15:04 ` Duy Nguyen
2016-07-09 5:23 ` [PATCH v3 2/4] test-lib.sh: introduce and use $_EMPTY_BLOB Nguyễn Thái Ngọc Duy
2016-07-09 5:23 ` [PATCH v3 3/4] cache-tree.c: fix i-t-a entry skipping directory updates sometimes Nguyễn Thái Ngọc Duy
2016-07-09 5:23 ` [PATCH v3 4/4] cache-tree: do not generate empty trees as a result of all i-t-a subentries Nguyễn Thái Ngọc Duy
2016-07-12 20:49 ` Junio C Hamano
2016-07-13 14:59 ` Duy Nguyen
2016-07-16 5:06 ` Nguyễn Thái Ngọc Duy [this message]
2016-07-16 5:06 ` [PATCH v4 1/4] test-lib.sh: introduce and use $EMPTY_TREE Nguyễn Thái Ngọc Duy
2016-07-16 5:06 ` [PATCH v4 2/4] test-lib.sh: introduce and use $EMPTY_BLOB Nguyễn Thái Ngọc Duy
2016-07-16 5:06 ` [PATCH v4 3/4] cache-tree.c: fix i-t-a entry skipping directory updates sometimes Nguyễn Thái Ngọc Duy
2016-07-16 5:06 ` [PATCH v4 4/4] cache-tree: do not generate empty trees as a result of all i-t-a subentries Nguyễn Thái Ngọc Duy
2016-07-18 20:48 ` [PATCH v4 0/4] cache-tree building fix in the presence of ita entries 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160716050627.9416-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=yuri.kanivetsky@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).