mirror of
https://github.com/git/git.git
synced 2024-05-28 05:46:38 +02:00
Merge branch 'jc/t2104-style-update'
Coding style fixes. * jc/t2104-style-update: t2104: style fixes
This commit is contained in:
commit
f43863e686
|
@ -11,27 +11,27 @@ TEST_PASSES_SANITIZE_LEAK=true
|
||||||
sane_unset GIT_TEST_SPLIT_INDEX
|
sane_unset GIT_TEST_SPLIT_INDEX
|
||||||
|
|
||||||
test_set_index_version () {
|
test_set_index_version () {
|
||||||
GIT_INDEX_VERSION="$1"
|
GIT_INDEX_VERSION="$1"
|
||||||
export GIT_INDEX_VERSION
|
export GIT_INDEX_VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
test_set_index_version 3
|
test_set_index_version 3
|
||||||
|
|
||||||
cat >expect.full <<EOF
|
|
||||||
H 1
|
|
||||||
H 2
|
|
||||||
H sub/1
|
|
||||||
H sub/2
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat >expect.skip <<EOF
|
|
||||||
S 1
|
|
||||||
H 2
|
|
||||||
S sub/1
|
|
||||||
H sub/2
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_expect_success 'setup' '
|
test_expect_success 'setup' '
|
||||||
|
cat >expect.full <<-\EOF &&
|
||||||
|
H 1
|
||||||
|
H 2
|
||||||
|
H sub/1
|
||||||
|
H sub/2
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat >expect.skip <<-\EOF &&
|
||||||
|
S 1
|
||||||
|
H 2
|
||||||
|
S sub/1
|
||||||
|
H sub/2
|
||||||
|
EOF
|
||||||
|
|
||||||
mkdir sub &&
|
mkdir sub &&
|
||||||
touch ./1 ./2 sub/1 sub/2 &&
|
touch ./1 ./2 sub/1 sub/2 &&
|
||||||
git add 1 2 sub/1 sub/2 &&
|
git add 1 2 sub/1 sub/2 &&
|
||||||
|
|
Loading…
Reference in New Issue