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 v2 0/2] cache-tree building fix in the presence of ita entries
Date: Wed, 6 Jul 2016 20:48:27 +0200 [thread overview]
Message-ID: <20160706184829.31825-1-pclouds@gmail.com> (raw)
In-Reply-To: <20160704174807.6578-1-pclouds@gmail.com>
1/2 is the same as before with some test fixups from Junio.
2/2 fixes the empty tree generation found by Junio. I split it out
because the commit message in 1/2 is already long. And because it can
happen even without 1/2 (i.e. yet another bug :( though really hard to
happen).
Suppose a/b/c contains all i-t-a entries. Without 1/2, we skip adding
'c' to the tree object 'a/b' (by luck). But if 'a/b' has _nothing_
else but 'a/b/c' then again we will have an empty tree object, which
should not be added in 'a'. It's a cascading effect all the way up.
Nguyễn Thái Ngọc Duy (2):
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 | 20 ++++++++++++++++++--
t/t2203-add-intent.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
--
2.8.2.537.g0965dd9
next prev parent reply other threads:[~2016-07-06 18:49 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 ` Nguyễn Thái Ngọc Duy [this message]
2016-07-06 18:48 ` [PATCH v2 1/2] cache-tree.c: fix i-t-a entry " 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 ` [PATCH v4 0/4] cache-tree building fix in the presence of ita entries Nguyễn Thái Ngọc Duy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160706184829.31825-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.
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).