diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2021-10-08 14:08:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-08 15:06:06 -0700 |
| commit | 155b517d5c8701f3b8bef78fe59d8fe33adbee96 (patch) | |
| tree | 73c5f0876086349e4bc518a6a938f68e65cfa9dc /strbuf.h | |
| parent | 8788195c8846be949e6cd4bd19c8dc5e6371ffd3 (diff) | |
| download | git-155b517d5c8701f3b8bef78fe59d8fe33adbee96.tar.gz | |
merge-{ort,recursive}: remove add_submodule_odb()
After the parent commit and some of its ancestors, the only place
commits are being accessed through alternates is in the user-facing
message formatting code. Fix those, and remove the add_submodule_odb()
calls.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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); /** |