Browse Source

Merge branch 'jc/add-u-A-default-to-top'

"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
maint
Junio C Hamano 10 years ago
parent
commit
f7722a447a
  1. 8
      builtin/add.c
  2. 2
      t/t2200-add-update.sh
  3. 1
      t/t2202-add-addremove.sh

8
builtin/add.c

@ -336,14 +336,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) @@ -336,14 +336,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
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));

hold_locked_index(&lock_file, 1);


2
t/t2200-add-update.sh

@ -84,6 +84,8 @@ test_expect_success 'non-qualified update in subdir updates from the root' ' @@ -84,6 +84,8 @@ test_expect_success 'non-qualified update in subdir updates from the root' '
(
cd dir1 &&
echo even more >>sub2 &&
git --literal-pathspecs add -u &&
echo even more >>sub2 &&
git add -u
) &&
: >expect &&

1
t/t2202-add-addremove.sh

@ -14,6 +14,7 @@ test_expect_success setup ' @@ -14,6 +14,7 @@ test_expect_success setup '
echo expect
echo ignored
) >.gitignore &&
git --literal-pathspecs add --all &&
>will-remove &&
git add --all &&
test_tick &&

Loading…
Cancel
Save