diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-08 10:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-08 10:18:43 -0700 |
| commit | 5aec7231c8daabeca7cb2d3caa0ed0f88223f81e (patch) | |
| tree | cfff1d955d7081ff68c3e383fcd9c8436004c893 /reftable/error.c | |
| parent | Start the 2.46 cycle (diff) | |
| parent | reftable/block: reuse compressed array (diff) | |
| download | git-5aec7231c8daabeca7cb2d3caa0ed0f88223f81e.tar.gz git-5aec7231c8daabeca7cb2d3caa0ed0f88223f81e.zip | |
Merge branch 'ps/reftable-write-optim'
Code to write out reftable has seen some optimization and
simplification.
* ps/reftable-write-optim:
reftable/block: reuse compressed array
reftable/block: reuse zstream when writing log blocks
reftable/writer: reset `last_key` instead of releasing it
reftable/writer: unify releasing memory
reftable/writer: refactorings for `writer_flush_nonempty_block()`
reftable/writer: refactorings for `writer_add_record()`
refs/reftable: don't recompute committer ident
reftable: remove name checks
refs/reftable: skip duplicate name checks
refs/reftable: perform explicit D/F check when writing symrefs
refs/reftable: fix D/F conflict error message on ref copy
Diffstat (limited to 'reftable/error.c')
| -rw-r--r-- | reftable/error.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/reftable/error.c b/reftable/error.c index cfb7a0fda4..a25f28a43e 100644 --- a/reftable/error.c +++ b/reftable/error.c @@ -27,8 +27,6 @@ const char *reftable_error_str(int err) return "misuse of the reftable API"; case REFTABLE_ZLIB_ERROR: return "zlib failure"; - case REFTABLE_NAME_CONFLICT: - return "file/directory conflict"; case REFTABLE_EMPTY_TABLE_ERROR: return "wrote empty table"; case REFTABLE_REFNAME_ERROR: |