undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5318: reorder test below 'graph_read_expect'

Browse Source 
In the subsequent commit, we will introduce a dependency on
'graph_read_expect' from t5318.7. Preemptively move it below
'graph_read_expect()'s definition so that the test can call it.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2020-05-13 15:59:51 -06:00 committed by Junio C Hamano
parent 0ec2d0ff07
commit 1f1304d497
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/t5318-commit-graph.sh
View File

@ -42,15 +42,6 @@ test_expect_success 'create commits and repack' '
git repack git repack
' '
test_expect_success 'exit with correct error on bad input to --stdin-commits' '
cd "$TRASH_DIRECTORY/full" &&
echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
test_i18ngrep "unexpected non-hex object ID: HEAD" stderr &&
# valid tree OID, but not a commit OID
git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
test_i18ngrep "invalid commit object id" stderr
'
graph_git_two_modes() { graph_git_two_modes() {
git -c core.commitGraph=true $1 >output git -c core.commitGraph=true $1 >output
git -c core.commitGraph=false $1 >expect git -c core.commitGraph=false $1 >expect
@ -91,6 +82,15 @@ graph_read_expect() {
test_cmp expect output test_cmp expect output
} }
test_expect_success 'exit with correct error on bad input to --stdin-commits' '
cd "$TRASH_DIRECTORY/full" &&
echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
test_i18ngrep "unexpected non-hex object ID: HEAD" stderr &&
# valid tree OID, but not a commit OID
git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
test_i18ngrep "invalid commit object id" stderr
'
test_expect_success 'write graph' ' test_expect_success 'write graph' '
cd "$TRASH_DIRECTORY/full" && cd "$TRASH_DIRECTORY/full" &&
git commit-graph write && git commit-graph write &&