development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/add-empty-fix' into maint

Browse source 
"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
This commit is contained in:
Junio C Hamano 2014-02-05 14:02:44 -08:00
parent d11ade701a 64ed07cee0
commit ee5788e306
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/add.c
View file

@ -544,7 +544,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
for (i = 0; i < pathspec.nr; i++) {
const char *path = pathspec.items[i].match;
if (!seen[i] &&
if (!seen[i] && path[0] &&
((pathspec.items[i].magic &
(PATHSPEC_GLOB | PATHSPEC_ICASE)) ||
!file_exists(path))) {

19
t/t3700-add.sh
View file

@ -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 &&