From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 29 Apr 2007 00:29:23 +0000 (-0400)
Subject: Catch empty pathnames in trees during fsck
X-Git-Tag: v1.5.1.3~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb2cada6da9d71604fd09efbff47cddbea453e1e;p=git.git

Catch empty pathnames in trees during fsck

Released versions of fast-import have been able to create a tree that
contains files or subtrees that contain no name.  Unfortunately these
trees aren't valid, but people may have actually tried to create them
due to bugs in import-tars.perl or their own fast-import frontend.

We now look for this unusual condition and warn the user if at
least one of their tree objects contains the problem.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-fsck.c b/builtin-fsck.c
index 7c3b0a535..75e10e25e 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -218,6 +218,7 @@ static int fsck_tree(struct tree *item)
 {
 	int retval;
 	int has_full_path = 0;
+	int has_empty_name = 0;
 	int has_zero_pad = 0;
 	int has_bad_modes = 0;
 	int has_dup_entries = 0;
@@ -241,6 +242,8 @@ static int fsck_tree(struct tree *item)
 
 		if (strchr(name, '/'))
 			has_full_path = 1;
+		if (!*name)
+			has_empty_name = 1;
 		has_zero_pad |= *(char *)desc.buffer == '0';
 		update_tree_entry(&desc);
 
@@ -289,6 +292,9 @@ static int fsck_tree(struct tree *item)
 	if (has_full_path) {
 		objwarning(&item->object, "contains full pathnames");
 	}
+	if (has_empty_name) {
+		objwarning(&item->object, "contains empty pathname");
+	}
 	if (has_zero_pad) {
 		objwarning(&item->object, "contains zero-padded file modes");
 	}