diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:03 -0800 |
| commit | 4ba46c28471b94de561d00f8b01da79b59527c62 (patch) | |
| tree | 288962cb17e69b5f144e179fec91baceadcfc6a0 | |
| parent | 0c52457b7c6311d004d0fb1f5b7bb7d5cc6dbf4e (diff) | |
| parent | 64ed07cee0394509c65331f1e7acb36c58fd18fb (diff) | |
| download | git-4ba46c28471b94de561d00f8b01da79b59527c62.tar.gz git-4ba46c28471b94de561d00f8b01da79b59527c62.tar.xz | |
Merge branch 'nd/add-empty-fix'
"git add -A" (no other arguments) in a totally empty working tree
used to emit an error.
* nd/add-empty-fix:
add: don't complain when adding empty project root
| -rw-r--r-- | builtin/add.c | 2 | ||||
| -rwxr-xr-x | t/t3700-add.sh | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index 0df73ae73..2a2722fa1 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -547,7 +547,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) const char *path = pathspec.items[i].match; if (pathspec.items[i].magic & PATHSPEC_EXCLUDE) continue; - if (!seen[i] && + if (!seen[i] && path[0] && ((pathspec.items[i].magic & (PATHSPEC_GLOB | PATHSPEC_ICASE)) || !file_exists(path))) { diff --git a/t/t3700-add.sh b/t/t3700-add.sh index aab86e838..fe274e2fb 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -272,6 +272,25 @@ test_expect_success '"add non-existent" should fail' ' ! (git ls-files | grep "non-existent") ' +test_expect_success 'git add -A on empty repo does not error out' ' + rm -fr empty && + git init empty && + ( + cd empty && + git add -A . && + git add -A + ) +' + +test_expect_success '"git add ." in empty repo' ' + rm -fr empty && + git init empty && + ( + cd empty && + git add . + ) +' + test_expect_success 'git add --dry-run of existing changed file' " echo new >>track-this && git add --dry-run track-this >actual 2>&1 && |