diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-04 17:25:52 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-04 17:25:52 +0200 |
commit | e7dca80692dec7f0717d9ad6d978d0ceab90cf6a (patch) | |
tree | 3fd355c15df79b7e89ba63c906b6b5b34100513e /transport.c | |
parent | csum-file.h: remove unnecessary inclusion of cache.h (diff) | |
parent | libs: use "struct repository *" argument, not "the_repository" (diff) | |
download | git-e7dca80692dec7f0717d9ad6d978d0ceab90cf6a.tar.xz git-e7dca80692dec7f0717d9ad6d978d0ceab90cf6a.zip |
Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
* ab/remove-implicit-use-of-the-repository:
libs: use "struct repository *" argument, not "the_repository"
post-cocci: adjust comments for recent repo_* migration
cocci: apply the "revision.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: add missing "the_repository" macros to "pending"
cocci: sort "the_repository" rules by header
cocci: fix incorrect & verbose "the_repository" rules
cocci: remove dead rule from "the_repository.pending.cocci"
Diffstat (limited to 'transport.c')
-rw-r--r-- | transport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 4f06ccbee0..d2a1af43b5 100644 --- a/transport.c +++ b/transport.c @@ -781,7 +781,8 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, static int measure_abbrev(const struct object_id *oid, int sofar) { char hex[GIT_MAX_HEXSZ + 1]; - int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV); + int w = repo_find_unique_abbrev_r(the_repository, hex, oid, + DEFAULT_ABBREV); return (w < sofar) ? sofar : w; } |