From: Andy Parkins <andyparkins@gmail.com>
Date: Sun, 01 Apr 2007 08:25:24 GMT
Subject: Re: git-add has gone lstat() mad
Message-ID: <200704010925.26590.andyparkins@gmail.com>
In-Reply-To: <7vy7ld3p33.fsf@assigned-by-dhcp.cox.net>

On Sunday 2007, April 01, Junio C Hamano wrote:

> But I like this patch better.  We need to look at .gitignore to
> warn about adding ignored files, so we cannot just stuff what
> are found to dir without checking if they are ignored.

I needed the following needed on top of current pu:

diff --git a/unpack-trees.c b/unpack-trees.c
index fa36495..d4f7589 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -521,7 +521,7 @@ static void verify_clean_subdirectory(const char *path, const char *action,
 	memset(&d, 0, sizeof(d));
 	if (o->dir)
 		d.exclude_per_dir = o->dir->exclude_per_dir;
-	i = read_directory(&d, path, pathbuf, namelen+1);
+	i = read_directory(&d, path, pathbuf, namelen+1, NULL);
 	if (i)
 		die("Updating '%s' would lose untracked files in it",
 		    path);