projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-reset.txt: Small fix + clarifications.
[git.git]
/
t
/
t0000-basic.sh
diff --git
a/t/t0000-basic.sh
b/t/t0000-basic.sh
index
547488b
..
dff7d69
100755
(executable)
--- a/
t/t0000-basic.sh
+++ b/
t/t0000-basic.sh
@@
-28,24
+28,25
@@
test_expect_success \
'.git/objects should be empty after git-init-db in an empty repo.' \
'cmp -s /dev/null should-be-empty'
'.git/objects should be empty after git-init-db in an empty repo.' \
'cmp -s /dev/null should-be-empty'
-# also it should have 257 subdirectories. 258 is counting "objects"
+# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
+# 3 is counting "objects" itself
find .git/objects -type d -print >full-of-directories
test_expect_success \
find .git/objects -type d -print >full-of-directories
test_expect_success \
- '.git/objects should have
257
subdirectories.' \
- 'test $(wc -l < full-of-directories) =
258
'
+ '.git/objects should have
3
subdirectories.' \
+ 'test $(wc -l < full-of-directories) =
3
'
################################################################
# Basics of the basics
# updating a new file without --add should fail.
test_expect_failure \
################################################################
# Basics of the basics
# updating a new file without --add should fail.
test_expect_failure \
- 'git-update-
cache
without --add should fail adding.' \
- 'git-update-
cache
should-be-empty'
+ 'git-update-
index
without --add should fail adding.' \
+ 'git-update-
index
should-be-empty'
# and with --add it should succeed, even if it is empty (it used to fail).
test_expect_success \
# and with --add it should succeed, even if it is empty (it used to fail).
test_expect_success \
- 'git-update-
cache
with --add should succeed.' \
- 'git-update-
cache
--add should-be-empty'
+ 'git-update-
index
with --add should succeed.' \
+ 'git-update-
index
--add should-be-empty'
test_expect_success \
'writing tree out with git-write-tree' \
test_expect_success \
'writing tree out with git-write-tree' \
@@
-59,12
+60,12
@@
test_expect_success \
# Removing paths.
rm -f should-be-empty full-of-directories
test_expect_failure \
# Removing paths.
rm -f should-be-empty full-of-directories
test_expect_failure \
- 'git-update-
cache
without --remove should fail removing.' \
- 'git-update-
cache
should-be-empty'
+ 'git-update-
index
without --remove should fail removing.' \
+ 'git-update-
index
should-be-empty'
test_expect_success \
test_expect_success \
- 'git-update-
cache
with --remove should be able to remove.' \
- 'git-update-
cache
--remove should-be-empty'
+ 'git-update-
index
with --remove should be able to remove.' \
+ 'git-update-
index
--remove should-be-empty'
# Empty tree can be written with recent write-tree.
test_expect_success \
# Empty tree can be written with recent write-tree.
test_expect_success \
@@
-83,8
+84,8
@@
do
ln -s "hello $p" ${p}sym
done
test_expect_success \
ln -s "hello $p" ${p}sym
done
test_expect_success \
- 'adding various types of objects with git-update-
cache
--add.' \
- 'find path* ! -type d -print
0 | xargs -0 git-update-cache
--add'
+ 'adding various types of objects with git-update-
index
--add.' \
+ 'find path* ! -type d -print
| xargs git-update-index
--add'
# Show them and see that matches what we expect.
test_expect_success \
# Show them and see that matches what we expect.
test_expect_success \
@@
-169,11
+170,11
@@
test_expect_success \
'git-diff-files >current && diff >/dev/null -b current expected'
test_expect_success \
'git-diff-files >current && diff >/dev/null -b current expected'
test_expect_success \
- 'git-update-
cache
--refresh should succeed.' \
- 'git-update-
cache
--refresh'
+ 'git-update-
index
--refresh should succeed.' \
+ 'git-update-
index
--refresh'
test_expect_success \
test_expect_success \
- 'no diff after checkout and git-update-
cache
--refresh.' \
+ 'no diff after checkout and git-update-
index
--refresh.' \
'git-diff-files >current && cmp -s current /dev/null'
test_done
'git-diff-files >current && cmp -s current /dev/null'
test_done