Merge branch 'jc/warn-pathless-add-finishing-touches'

gitster · gitster · commit aedb94b3f05b · 2013-04-26T15:17:48.000-07:00
* jc/warn-pathless-add-finishing-touches:
  git add: avoid "-u/-A without pathspec" warning on stat-dirty paths
diff --git a/builtin/add.c b/builtin/add.c
@@ -542,6 +542,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		refresh(verbose, pathspec);
 		goto finish;
 	}
+	if (implicit_dot && prefix)
+		refresh_cache(REFRESH_QUIET);
 
 	if (pathspec) {
 		int i;

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,8 @@ int cmd_add(int argc, const char *argv, const char prefix)`
`542`	`542`	`refresh(verbose, pathspec);`
`543`	`543`	`goto finish;`
`544`	`544`	`}`
	`545`	`+ if (implicit_dot && prefix)`
	`546`	`+ refresh_cache(REFRESH_QUIET);`
`545`	`547`
`546`	`548`	`if (pathspec) {`
`547`	`549`	`int i;`