diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:56 (GMT) |
| commit | 162a13b855ee8d920a31d6d1e928cef0f0a18e18 (patch) | |
| tree | c1bfa439f65e07a38957a665c31cbe4dcdcb0b1a /strbuf.h | |
| parent | bfa646c2cbad55cf652344415616eadc9e20f3c4 (diff) | |
| parent | 71ef66d7403c05a6fe8ec118431332a8919b52a2 (diff) | |
| download | git-162a13b855ee8d920a31d6d1e928cef0f0a18e18.zip git-162a13b855ee8d920a31d6d1e928cef0f0a18e18.tar.gz git-162a13b855ee8d920a31d6d1e928cef0f0a18e18.tar.bz2 | |
Merge branch 'jt/no-abuse-alternate-odb-for-submodules'
Follow through the work to use the repo interface to access
submodule objects in-process, instead of abusing the alternate
object database interface.
* jt/no-abuse-alternate-odb-for-submodules:
submodule: trace adding submodule ODB as alternate
submodule: pass repo to check_has_commit()
object-file: only register submodule ODB if needed
merge-{ort,recursive}: remove add_submodule_odb()
refs: peeling non-the_repository iterators is BUG
refs: teach arbitrary repo support to iterators
refs: plumb repo into ref stores
Diffstat (limited to 'strbuf.h')
| -rw-r--r-- | strbuf.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -634,8 +634,10 @@ void strbuf_list_free(struct strbuf **list); * Add the abbreviation, as generated by find_unique_abbrev, of `sha1` to * the strbuf `sb`. */ -void strbuf_add_unique_abbrev(struct strbuf *sb, - const struct object_id *oid, +struct repository; +void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo, + const struct object_id *oid, int abbrev_len); +void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, int abbrev_len); /** |