Merge branch 'jk/maint-add-empty' into maint

gitster · gitster · commit 43f8f560c03f · 2009-05-25T19:01:41.000-07:00
* jk/maint-add-empty:
  add: don't complain when adding empty project root
diff --git a/builtin-add.c b/builtin-add.c
@@ -61,7 +61,7 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
 	fill_pathspec_matches(pathspec, seen, specs);
 
 	for (i = 0; i < specs; i++) {
-		if (!seen[i] && !file_exists(pathspec[i]))
+		if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))
 			die("pathspec '%s' did not match any files",
 					pathspec[i]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static void prune_directory(struct dir_struct dir, const char *pathspec, int p`
`61`	`61`	`fill_pathspec_matches(pathspec, seen, specs);`
`62`	`62`
`63`	`63`	`for (i = 0; i < specs; i++) {`
`64`		`- if (!seen[i] && !file_exists(pathspec[i]))`
	`64`	`+ if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i]))`
`65`	`65`	`die("pathspec '%s' did not match any files",`
`66`	`66`	`pathspec[i]);`
`67`	`67`	`}`