]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/add-u-A-default-to-top'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:06:55 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:06:55 +0000 (13:06 -0700)
"git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.

* jc/add-u-A-default-to-top:
  add: simplify -u/-A without pathspec

1  2 
builtin/add.c

diff --cc builtin/add.c
index b2a5c57f0afde85a7584e1edc7a45b67d12d143d,06ad3653f0105b411d5effe219105305cb47b843..145f06ef97afd1e9e8d5cbe13da82cffa504e32c
@@@ -336,16 -336,10 +336,10 @@@ int cmd_add(int argc, const char **argv
        if (!show_only && ignore_missing)
                die(_("Option --ignore-missing can only be used together with --dry-run"));
  
-       if ((0 < addremove_explicit || take_worktree_changes) && !argc) {
-               static const char *whole[2] = { ":/", NULL };
-               argc = 1;
-               argv = whole;
-       }
        add_new_files = !take_worktree_changes && !refresh_only;
-       require_pathspec = !take_worktree_changes;
+       require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
  
 -      newfd = hold_locked_index(&lock_file, 1);
 +      hold_locked_index(&lock_file, 1);
  
        flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
                 (show_only ? ADD_CACHE_PRETEND : 0) |