| Message ID | 20250219-pks-update-ref-optimization-v2-1-e696e7220b22@pks.im (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | refs: batch refname availability checks | expand |
On 25/02/19 02:23PM, Patrick Steinhardt wrote: [snip] > diff --git a/object-name.c b/object-name.c > index 945d5bdef25..bc0265ad2a1 100644 > --- a/object-name.c > +++ b/object-name.c > @@ -1794,18 +1794,20 @@ void object_context_release(struct object_context *ctx) > strbuf_release(&ctx->symlink_path); > } > > -/* > - * This is like "get_oid_basic()", except it allows "object ID expressions", > - * notably "xyz^" for "parent of xyz" > - */ > -int repo_get_oid(struct repository *r, const char *name, struct object_id *oid) > +int repo_get_oid_with_flags(struct repository *r, const char *name, struct object_id *oid, > + unsigned flags) style: The function signature runs a bit long on the first line. Not a big deal, but we could reformat it. > { > struct object_context unused; > - int ret = get_oid_with_context(r, name, 0, oid, &unused); > + int ret = get_oid_with_context(r, name, flags, oid, &unused); > object_context_release(&unused); > return ret; > } > > +int repo_get_oid(struct repository *r, const char *name, struct object_id *oid) > +{ > + return repo_get_oid_with_flags(r, name, oid, 0); > +} > + > /* > * This returns a non-zero value if the string (built using printf > * format and the given arguments) is not a valid object. > diff --git a/object-name.h b/object-name.h > index 8dba4a47a47..fb5a97b2c8e 100644 > --- a/object-name.h > +++ b/object-name.h > @@ -51,6 +51,12 @@ void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo, > void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, > int abbrev_len); > > +/* > + * This is like "get_oid_basic()", except it allows "object ID expressions", > + * notably "xyz^" for "parent of xyz". Accepts GET_OID_* flags. > + */ > +int repo_get_oid_with_flags(struct repository *r, const char *str, struct object_id *oid, > + unsigned flags); Same here. > int repo_get_oid(struct repository *r, const char *str, struct object_id *oid); > __attribute__((format (printf, 2, 3))) > int get_oidf(struct object_id *oid, const char *fmt, ...); > > -- > 2.48.1.683.gf705b3209c.dirty > >
diff --git a/object-name.c b/object-name.c index 945d5bdef25..bc0265ad2a1 100644 --- a/object-name.c +++ b/object-name.c @@ -1794,18 +1794,20 @@ void object_context_release(struct object_context *ctx) strbuf_release(&ctx->symlink_path); } -/* - * This is like "get_oid_basic()", except it allows "object ID expressions", - * notably "xyz^" for "parent of xyz" - */ -int repo_get_oid(struct repository *r, const char *name, struct object_id *oid) +int repo_get_oid_with_flags(struct repository *r, const char *name, struct object_id *oid, + unsigned flags) { struct object_context unused; - int ret = get_oid_with_context(r, name, 0, oid, &unused); + int ret = get_oid_with_context(r, name, flags, oid, &unused); object_context_release(&unused); return ret; } +int repo_get_oid(struct repository *r, const char *name, struct object_id *oid) +{ + return repo_get_oid_with_flags(r, name, oid, 0); +} + /* * This returns a non-zero value if the string (built using printf * format and the given arguments) is not a valid object. diff --git a/object-name.h b/object-name.h index 8dba4a47a47..fb5a97b2c8e 100644 --- a/object-name.h +++ b/object-name.h @@ -51,6 +51,12 @@ void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo, void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, int abbrev_len); +/* + * This is like "get_oid_basic()", except it allows "object ID expressions", + * notably "xyz^" for "parent of xyz". Accepts GET_OID_* flags. + */ +int repo_get_oid_with_flags(struct repository *r, const char *str, struct object_id *oid, + unsigned flags); int repo_get_oid(struct repository *r, const char *str, struct object_id *oid); __attribute__((format (printf, 2, 3))) int get_oidf(struct object_id *oid, const char *fmt, ...);
Introduce a new function `repo_get_oid_with_flags()`. This function behaves the same as `repo_get_oid()`, except that it takes an extra `flags` parameter that it ends up passing to `get_oid_with_context()`. This function will be used in a subsequent commit. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- object-name.c | 14 ++++++++------ object-name.h | 6 ++++++ 2 files changed, 14 insertions(+), 6 deletions(-)