diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 20:39:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 20:39:52 (GMT) |
| commit | 6a1c17d05b0e67fa5f9661f492f407b984496b27 (patch) | |
| tree | 2abe4b8ae7cb8eb78e93ca07cd1e9426a876297d /t/t5318-commit-graph.sh | |
| parent | 2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f (diff) | |
| parent | dbd5e0a1861c5bb1446e5518173aa1760c6617b0 (diff) | |
| download | git-6a1c17d05b0e67fa5f9661f492f407b984496b27.zip git-6a1c17d05b0e67fa5f9661f492f407b984496b27.tar.gz git-6a1c17d05b0e67fa5f9661f492f407b984496b27.tar.bz2 | |
Merge branch 'tb/commit-graph-split-strategy'
"git commit-graph write" learned different ways to write out split
files.
* tb/commit-graph-split-strategy:
Revert "commit-graph.c: introduce '--[no-]check-oids'"
commit-graph.c: introduce '--[no-]check-oids'
commit-graph.h: replace 'commit_hex' with 'commits'
oidset: introduce 'oidset_size'
builtin/commit-graph.c: introduce split strategy 'replace'
builtin/commit-graph.c: introduce split strategy 'no-merge'
builtin/commit-graph.c: support for '--split[=<strategy>]'
t/helper/test-read-graph.c: support commit-graph chains
Diffstat (limited to 't/t5318-commit-graph.sh')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 9bf920a..e874a12 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -43,7 +43,7 @@ test_expect_success 'create commits and 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 "invalid commit object id" 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 |