mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'jk/t0002-simplify'
Code cleanup. * jk/t0002-simplify: t0002: simplify error checking
This commit is contained in:
commit
c260e13883
|
@ -10,15 +10,6 @@ objpath() {
|
|||
echo "$1" | sed -e 's|\(..\)|\1/|'
|
||||
}
|
||||
|
||||
objck() {
|
||||
p=$(objpath "$1")
|
||||
if test ! -f "$REAL/objects/$p"
|
||||
then
|
||||
echo "Object not found: $REAL/objects/$p"
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
test_expect_success 'initial setup' '
|
||||
REAL="$(pwd)/.real" &&
|
||||
mv .git "$REAL"
|
||||
|
@ -26,30 +17,14 @@ test_expect_success 'initial setup' '
|
|||
|
||||
test_expect_success 'bad setup: invalid .git file format' '
|
||||
echo "gitdir $REAL" >.git &&
|
||||
if git rev-parse 2>.err
|
||||
then
|
||||
echo "git rev-parse accepted an invalid .git file"
|
||||
false
|
||||
fi &&
|
||||
if ! grep "Invalid gitfile format" .err
|
||||
then
|
||||
echo "git rev-parse returned wrong error"
|
||||
false
|
||||
fi
|
||||
test_must_fail git rev-parse 2>.err &&
|
||||
grep "Invalid gitfile format" .err
|
||||
'
|
||||
|
||||
test_expect_success 'bad setup: invalid .git file path' '
|
||||
echo "gitdir: $REAL.not" >.git &&
|
||||
if git rev-parse 2>.err
|
||||
then
|
||||
echo "git rev-parse accepted an invalid .git file path"
|
||||
false
|
||||
fi &&
|
||||
if ! grep "Not a git repository" .err
|
||||
then
|
||||
echo "git rev-parse returned wrong error"
|
||||
false
|
||||
fi
|
||||
test_must_fail git rev-parse 2>.err &&
|
||||
grep "Not a git repository" .err
|
||||
'
|
||||
|
||||
test_expect_success 'final setup + check rev-parse --git-dir' '
|
||||
|
@ -60,7 +35,7 @@ test_expect_success 'final setup + check rev-parse --git-dir' '
|
|||
test_expect_success 'check hash-object' '
|
||||
echo "foo" >bar &&
|
||||
SHA=$(cat bar | git hash-object -w --stdin) &&
|
||||
objck $SHA
|
||||
test_path_is_file "$REAL/objects/$(objpath $SHA)"
|
||||
'
|
||||
|
||||
test_expect_success 'check cat-file' '
|
||||
|
@ -69,29 +44,21 @@ test_expect_success 'check cat-file' '
|
|||
'
|
||||
|
||||
test_expect_success 'check update-index' '
|
||||
if test -f "$REAL/index"
|
||||
then
|
||||
echo "Hmm, $REAL/index exists?"
|
||||
false
|
||||
fi &&
|
||||
test_path_is_missing "$REAL/index" &&
|
||||
rm -f "$REAL/objects/$(objpath $SHA)" &&
|
||||
git update-index --add bar &&
|
||||
if ! test -f "$REAL/index"
|
||||
then
|
||||
echo "$REAL/index not found"
|
||||
false
|
||||
fi &&
|
||||
objck $SHA
|
||||
test_path_is_file "$REAL/index" &&
|
||||
test_path_is_file "$REAL/objects/$(objpath $SHA)"
|
||||
'
|
||||
|
||||
test_expect_success 'check write-tree' '
|
||||
SHA=$(git write-tree) &&
|
||||
objck $SHA
|
||||
test_path_is_file "$REAL/objects/$(objpath $SHA)"
|
||||
'
|
||||
|
||||
test_expect_success 'check commit-tree' '
|
||||
SHA=$(echo "commit bar" | git commit-tree $SHA) &&
|
||||
objck $SHA
|
||||
test_path_is_file "$REAL/objects/$(objpath $SHA)"
|
||||
'
|
||||
|
||||
test_expect_success 'check rev-list' '
|
||||
|
|
Loading…
Reference in a new issue