threads / patch / 33081

patchadd: cut redundant require_pathspec logic

Subject: [PATCH] add: cut redundant require_pathspec logic

## tl;dr

One message between Mar 6, 2013 and Mar 6, 2013. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Greg Price· Mar 6, 2013, 07:24 UTC · lore

If take_worktree_changes is true, then the logic around option_with_implicit_dot ensures argc is positive by this point. So require_pathspec never has an effect.

Signed-off-by: Greg Price <price@mit.edu>
---
 builtin/add.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Show changes to builtin/add.c +1 −3
diff --git a/builtin/add.c b/builtin/add.c
index 0dd014e..9feb2ba 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -358,7 +358,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	struct dir_struct dir;
 	int flags;
 	int add_new_files;
-	int require_pathspec;
 	char *seen = NULL;
 	const char *option_with_implicit_dot = NULL;
 	const char *short_option_with_implicit_dot = NULL;
@@ -399,7 +398,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	}
 
 	add_new_files = !take_worktree_changes && !refresh_only;
-	require_pathspec = !take_worktree_changes;
 
 	newfd = hold_locked_index(&lock_file, 1);
 
@@ -410,7 +408,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		 (!(addremove || take_worktree_changes)
 		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
 
-	if (require_pathspec && argc == 0) {
+	if (argc == 0) {
 		fprintf(stderr, _("Nothing specified, nothing added.\n"));
 		fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
 		return 0;
-- 
1.7.11.3

← back to recent threads