From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jul 2008 00:53:17 +0000 (-0700)
Subject: Merge branch 'jc/add-addremove'
X-Git-Tag: v1.6.0-rc0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=378335b37cd711a44bd4c85d3643db36a7f1ac67;p=git.git

Merge branch 'jc/add-addremove'

* jc/add-addremove:
  git-add --all: documentation
  git-add --all: tests
  git-add --all: add all files
  builtin-add.c: restructure the code for maintainability

Conflicts:
	builtin-add.c
---

378335b37cd711a44bd4c85d3643db36a7f1ac67
diff --cc builtin-add.c
index 0800b14ac,6f5672a61..fc3f96eae
--- a/builtin-add.c
+++ b/builtin-add.c
@@@ -140,10 -140,7 +140,8 @@@ static void refresh(int verbose, const 
  	for (specs = 0; pathspec[specs];  specs++)
  		/* nothing */;
  	seen = xcalloc(specs, 1);
- 	if (read_cache() < 0)
- 		die("index file corrupt");
 -	refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
 +	refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
 +		      pathspec, seen);
  	for (i = 0; i < specs; i++) {
  		if (!seen[i])
  			die("pathspec '%s' did not match any files", pathspec[i]);