mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'ab/tests-various-fixup'
Various test updates. * ab/tests-various-fixup: rm tests: actually test for SIGPIPE in SIGPIPE test archive tests: use a cheaper "zipinfo -h" invocation to get header upload-pack tests: avoid a non-zero "grep" exit status git-svn tests: rewrite brittle tests to use "--[no-]merges". git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty git svn mergeinfo tests: modernize redirection & quoting style cache-tree tests: explicitly test HEAD and index differences cache-tree tests: use a sub-shell with less indirection cache-tree tests: remove unused $2 parameter cache-tree tests: refactor for modern test style
This commit is contained in:
Junio C Hamano
commit
2c873f9791
|
|
@ -10,40 +10,36 @@ cache-tree extension.
|
|||
cmp_cache_tree () {
|
||||
test-tool dump-cache-tree | sed -e '/#(ref)/d' >actual &&
|
||||
sed "s/$OID_REGEX/SHA/" <actual >filtered &&
|
||||
test_cmp "$1" filtered
|
||||
test_cmp "$1" filtered &&
|
||||
rm filtered
|
||||
}
|
||||
|
||||
# We don't bother with actually checking the SHA1:
|
||||
# test-tool dump-cache-tree already verifies that all existing data is
|
||||
# correct.
|
||||
generate_expected_cache_tree_rec () {
|
||||
dir="$1${1:+/}" &&
|
||||
parent="$2" &&
|
||||
# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
|
||||
# We want to count only foo because it's the only direct child
|
||||
git ls-files >files &&
|
||||
subtrees=$(grep / files|cut -d / -f 1|uniq) &&
|
||||
subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') &&
|
||||
entries=$(wc -l <files) &&
|
||||
printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
|
||||
for subtree in $subtrees
|
||||
do
|
||||
cd "$subtree"
|
||||
generate_expected_cache_tree_rec "$dir$subtree" "$dir" || return 1
|
||||
cd ..
|
||||
done &&
|
||||
dir=$parent
|
||||
}
|
||||
|
||||
generate_expected_cache_tree () {
|
||||
(
|
||||
generate_expected_cache_tree_rec
|
||||
)
|
||||
pathspec="$1" &&
|
||||
dir="$2${2:+/}" &&
|
||||
git ls-tree --name-only HEAD -- "$pathspec" >files &&
|
||||
git ls-tree --name-only -d HEAD -- "$pathspec" >subtrees &&
|
||||
printf "SHA %s (%d entries, %d subtrees)\n" "$dir" $(wc -l <files) $(wc -l <subtrees) &&
|
||||
while read subtree
|
||||
do
|
||||
generate_expected_cache_tree "$pathspec/$subtree/" "$subtree" || return 1
|
||||
done <subtrees
|
||||
}
|
||||
|
||||
test_cache_tree () {
|
||||
generate_expected_cache_tree >expect &&
|
||||
cmp_cache_tree expect
|
||||
generate_expected_cache_tree "." >expect &&
|
||||
cmp_cache_tree expect &&
|
||||
rm expect actual files subtrees &&
|
||||
git status --porcelain -- ':!status' ':!expected.status' >status &&
|
||||
if test -n "$1"
|
||||
then
|
||||
test_cmp "$1" status
|
||||
else
|
||||
test_must_be_empty status
|
||||
fi
|
||||
}
|
||||
|
||||
test_invalid_cache_tree () {
|
||||
|
|
@ -54,7 +50,7 @@ test_invalid_cache_tree () {
|
|||
}
|
||||
|
||||
test_no_cache_tree () {
|
||||
: >expect &&
|
||||
>expect &&
|
||||
cmp_cache_tree expect
|
||||
}
|
||||
|
||||
|
|
@ -83,18 +79,6 @@ test_expect_success 'git-add in subdir invalidates cache-tree' '
|
|||
test_invalid_cache_tree
|
||||
'
|
||||
|
||||
cat >before <<\EOF
|
||||
SHA (3 entries, 2 subtrees)
|
||||
SHA dir1/ (1 entries, 0 subtrees)
|
||||
SHA dir2/ (1 entries, 0 subtrees)
|
||||
EOF
|
||||
|
||||
cat >expect <<\EOF
|
||||
invalid (2 subtrees)
|
||||
invalid dir1/ (0 subtrees)
|
||||
SHA dir2/ (1 entries, 0 subtrees)
|
||||
EOF
|
||||
|
||||
test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
|
||||
git tag no-children &&
|
||||
test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
|
||||
|
|
@ -102,9 +86,20 @@ test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
|
|||
test_commit dir1/a &&
|
||||
test_commit dir2/b &&
|
||||
echo "I changed this file" >dir1/a &&
|
||||
test_when_finished "rm before" &&
|
||||
cat >before <<-\EOF &&
|
||||
SHA (3 entries, 2 subtrees)
|
||||
SHA dir1/ (1 entries, 0 subtrees)
|
||||
SHA dir2/ (1 entries, 0 subtrees)
|
||||
EOF
|
||||
cmp_cache_tree before &&
|
||||
echo "I changed this file" >dir1/a &&
|
||||
git add dir1/a &&
|
||||
cat >expect <<-\EOF &&
|
||||
invalid (2 subtrees)
|
||||
invalid dir1/ (0 subtrees)
|
||||
SHA dir2/ (1 entries, 0 subtrees)
|
||||
EOF
|
||||
cmp_cache_tree expect
|
||||
'
|
||||
|
||||
|
|
@ -133,6 +128,7 @@ test_expect_success 'second commit has cache-tree' '
|
|||
'
|
||||
|
||||
test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
|
||||
test_when_finished "git reset --hard" &&
|
||||
cat <<-\EOT >foo.c &&
|
||||
int foo()
|
||||
{
|
||||
|
|
@ -159,7 +155,10 @@ test_expect_success PERL 'commit --interactive gives cache-tree on partial commi
|
|||
EOT
|
||||
test_write_lines p 1 "" s n y q |
|
||||
git commit --interactive -m foo &&
|
||||
test_cache_tree
|
||||
cat <<-\EOF >expected.status &&
|
||||
M foo.c
|
||||
EOF
|
||||
test_cache_tree expected.status
|
||||
'
|
||||
|
||||
test_expect_success PERL 'commit -p with shrinking cache-tree' '
|
||||
|
|
@ -250,7 +249,10 @@ test_expect_success 'partial commit gives cache-tree' '
|
|||
git add one.t &&
|
||||
echo "some other change" >two.t &&
|
||||
git commit two.t -m partial &&
|
||||
test_cache_tree
|
||||
cat <<-\EOF >expected.status &&
|
||||
M one.t
|
||||
EOF
|
||||
test_cache_tree expected.status
|
||||
'
|
||||
|
||||
test_expect_success 'no phantom error when switching trees' '
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
|
|||
test_path_is_missing frotz/nitfol
|
||||
'
|
||||
|
||||
test_expect_success 'choking "git rm" should not let it die with cruft' '
|
||||
choke_git_rm_setup() {
|
||||
git reset -q --hard &&
|
||||
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
|
||||
i=0 &&
|
||||
|
|
@ -252,12 +252,24 @@ test_expect_success 'choking "git rm" should not let it die with cruft' '
|
|||
do
|
||||
echo "100644 $hash 0 some-file-$i"
|
||||
i=$(( $i + 1 ))
|
||||
done | git update-index --index-info &&
|
||||
done | git update-index --index-info
|
||||
}
|
||||
|
||||
test_expect_success 'choking "git rm" should not let it die with cruft (induce SIGPIPE)' '
|
||||
choke_git_rm_setup &&
|
||||
# git command is intentionally placed upstream of pipe to induce SIGPIPE
|
||||
git rm -n "some-file-*" | : &&
|
||||
test_path_is_missing .git/index.lock
|
||||
'
|
||||
|
||||
|
||||
test_expect_success !MINGW 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)' '
|
||||
choke_git_rm_setup &&
|
||||
OUT=$( ((trap "" PIPE; git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
|
||||
test_match_signal 13 "$OUT" &&
|
||||
test_path_is_missing .git/index.lock
|
||||
'
|
||||
|
||||
test_expect_success 'Resolving by removal is not a warning-worthy event' '
|
||||
git reset -q --hard &&
|
||||
test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
|
||||
|
|
|
|||
|
|
@ -153,7 +153,8 @@ test_expect_success ZIPINFO 'zip archive with many entries' '
|
|||
|
||||
# check the number of entries in the ZIP file directory
|
||||
expr 65536 + 256 >expect &&
|
||||
"$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
|
||||
"$ZIPINFO" -h many.zip >zipinfo &&
|
||||
sed -n "2s/.* //p" <zipinfo >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ get_actual_commits () {
|
|||
test-tool pkt-line unpack-sideband <out >o.pack &&
|
||||
git index-pack o.pack &&
|
||||
git verify-pack -v o.idx >objs &&
|
||||
grep commit objs | cut -d" " -f1 | sort >actual_commits
|
||||
sed -n -e 's/\([0-9a-f][0-9a-f]*\) commit .*/\1/p' objs >objs.sed &&
|
||||
sort >actual_commits <objs.sed
|
||||
}
|
||||
|
||||
check_output () {
|
||||
|
|
|
|||
|
|
@ -12,49 +12,46 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|||
|
||||
test_expect_success 'load svn dump' "
|
||||
svnadmin load -q '$rawsvnrepo' \
|
||||
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
||||
<'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
||||
git svn init --minimize-url -R svnmerge \
|
||||
--rewrite-root=http://svn.example.org \
|
||||
-T trunk -b branches '$svnrepo' &&
|
||||
git svn fetch --all
|
||||
"
|
||||
"
|
||||
|
||||
test_expect_success 'all svn merges became git merge commits' '
|
||||
unmarked=$(git rev-list --parents --all --grep=Merge |
|
||||
grep -v " .* " | cut -f1 -d" ") &&
|
||||
[ -z "$unmarked" ]
|
||||
'
|
||||
git rev-list --all --no-merges --grep=Merge >unmarked &&
|
||||
test_must_be_empty unmarked
|
||||
'
|
||||
|
||||
test_expect_success 'cherry picks did not become git merge commits' '
|
||||
bad_cherries=$(git rev-list --parents --all --grep=Cherry |
|
||||
grep " .* " | cut -f1 -d" ") &&
|
||||
[ -z "$bad_cherries" ]
|
||||
'
|
||||
git rev-list --all --merges --grep=Cherry >bad-cherries &&
|
||||
test_must_be_empty bad-cherries
|
||||
'
|
||||
|
||||
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
|
||||
bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
|
||||
grep " .* " | cut -f1 -d" ") &&
|
||||
[ -z "$bad_non_merges" ]
|
||||
'
|
||||
git rev-list --all --merges --grep=non-merge >bad-non-merges &&
|
||||
test_must_be_empty bad-non-merges
|
||||
'
|
||||
|
||||
test_expect_success 'commit made to merged branch is reachable from the merge' '
|
||||
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
|
||||
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
|
||||
not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
|
||||
[ -z "$not_reachable" ]
|
||||
'
|
||||
git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
|
||||
test_must_be_empty not-reachable
|
||||
'
|
||||
|
||||
test_expect_success 'merging two branches in one commit is detected correctly' '
|
||||
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
|
||||
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
|
||||
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
|
||||
not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
|
||||
[ -z "$not_reachable" ]
|
||||
'
|
||||
git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
|
||||
test_must_be_empty not-reachable
|
||||
'
|
||||
|
||||
test_expect_failure 'everything got merged in the end' '
|
||||
unmerged=$(git rev-list --all --not main) &&
|
||||
[ -z "$unmerged" ]
|
||||
'
|
||||
git rev-list --all --not main >unmerged &&
|
||||
test_must_be_empty unmerged
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Reference in a new issue