From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org, Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Cc: "Jakub Narebski" <jnareb@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Dmitry S. Kravtsov" <idkravitz@gmail.com>,
"Shawn Pearce" <spearce@spearce.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] cache-tree: do not cache empty trees
Date: Sat, 5 Feb 2011 15:30:11 +0700 [thread overview]
Message-ID: <1296894611-29398-1-git-send-email-pclouds@gmail.com> (raw)
Current index does not support empty trees. But users can construct
empty trees directly using plumbing. When empty trees are checked out,
things become inconsistent:
- If cache-tree somehow is invalidated, when a tree is read to index,
empty trees disappear. When we write trees back, empty trees will
be gone.
- If cache-tree is generated by read-tree and remains valid by the
time trees are written back, empty trees remain.
Let's do it in a consistent way, always disregard empty trees in
index. If users choose to create empty trees their own way, they
should not use index at all.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
On Wed, Feb 2, 2011 at 2:09 AM, Ilari Liusvaara <ilari.liusvaara@elisanet.fi> wrote:
> Yes, writing to index/working area. IIRC, having such entry in tree causes
> a "ghost directory". I don't exactly recall what such thing broke, but I
> remember that it broke something (merging?)...
>
> Those ghosts also had annoying tendency to persist between commits. Commits
> didn't kill them. Rm didn't work. You had to create something on top/inside to
> get rid of them.
That's probably because of cache-tree. Empty trees can't exist in
index so an operation "trees -> index -> trees" will remove empty
trees.
But read-tree can preserve the exact structure of original trees
(including empty trees) so if that particular path is untouched,
empty trees will remain.
Perhaps a patch like this for pre-1.8.0?
cache-tree.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index f755590..f717793 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -621,6 +621,8 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
struct tree *subtree = lookup_tree(entry.sha1);
if (!subtree->object.parsed)
parse_tree(subtree);
+ if (!hashcmp(entry.sha1, (unsigned char *)EMPTY_TREE_SHA1_BIN))
+ continue;
sub = cache_tree_sub(it, entry.path);
sub->cache_tree = cache_tree();
prime_cache_tree_rec(sub->cache_tree, subtree);
--
1.7.3.4.878.g439c7
next reply other threads:[~2011-02-05 8:31 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-05 8:30 Nguyễn Thái Ngọc Duy [this message]
2011-02-05 9:50 ` [PATCH] cache-tree: do not cache empty trees Nguyễn Thái Ngọc Duy
2011-02-05 10:14 ` Jonathan Nieder
2011-02-05 10:32 ` Nguyen Thai Ngoc Duy
2011-02-05 14:07 ` Nguyễn Thái Ngọc Duy
2011-02-07 2:09 ` Junio C Hamano
2011-02-07 2:36 ` Nguyen Thai Ngoc Duy
2011-02-07 8:17 ` [PATCH] correct type of EMPTY_TREE_SHA1_BIN Jonathan Nieder
2011-02-09 23:33 ` Junio C Hamano
2011-02-07 9:17 ` [PATCH] cache-tree: do not cache empty trees Jonathan Nieder
2011-02-07 9:57 ` Nguyen Thai Ngoc Duy
2011-02-07 12:18 ` Ilari Liusvaara
2011-02-07 12:29 ` Nguyen Thai Ngoc Duy
2011-02-07 12:32 ` Jonathan Nieder
2011-02-07 20:48 ` Junio C Hamano
2011-02-08 4:11 ` Nguyen Thai Ngoc Duy
2011-02-08 4:30 ` Jonathan Nieder
2011-02-15 10:19 ` Yann Dirson
2011-02-16 14:29 ` Jakub Narebski
2011-02-08 10:40 ` Ilari Liusvaara
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=1296894611-29398-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=idkravitz@gmail.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=jnareb@gmail.com \
--cc=jrnieder@gmail.com \
--cc=spearce@spearce.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.
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).