diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:56 -0700 |
| commit | 162a13b855ee8d920a31d6d1e928cef0f0a18e18 (patch) | |
| tree | c1bfa439f65e07a38957a665c31cbe4dcdcb0b1a /strbuf.c | |
| parent | bfa646c2cbad55cf652344415616eadc9e20f3c4 (diff) | |
| parent | 71ef66d7403c05a6fe8ec118431332a8919b52a2 (diff) | |
| download | git-162a13b855ee8d920a31d6d1e928cef0f0a18e18.tar.gz | |
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.c')
| -rw-r--r-- | strbuf.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1059,15 +1059,21 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm, strbuf_setlen(sb, sb->len + len); } -void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, - int abbrev_len) +void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo, + const struct object_id *oid, int abbrev_len) { int r; strbuf_grow(sb, GIT_MAX_HEXSZ + 1); - r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len); + r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len); strbuf_setlen(sb, sb->len + r); } +void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, + int abbrev_len) +{ + strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len); +} + /* * Returns the length of a line, without trailing spaces. * |