kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

object-name: introduce `repo_get_oid_with_flags()` 

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2025-03-12 16:56:07 +01:00 committed by Junio C Hamano
parent 08bdfd4535
commit 37e7546b91
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
object-name.c
View File

@ -1794,18 +1794,20 @@ void object_context_release(struct object_context *ctx)
strbuf_release(&ctx->symlink_path); strbuf_release(&ctx->symlink_path);
} }


/* int repo_get_oid_with_flags(struct repository *r, const char *name,
* This is like "get_oid_basic()", except it allows "object ID expressions", struct object_id *oid, unsigned flags)
* notably "xyz^" for "parent of xyz"
*/
int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
{ {
struct object_context unused; 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); object_context_release(&unused);
return ret; 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 * This returns a non-zero value if the string (built using printf
* format and the given arguments) is not a valid object. * format and the given arguments) is not a valid object.

6
object-name.h
View File

@ -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, void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
int abbrev_len); 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); int repo_get_oid(struct repository *r, const char *str, struct object_id *oid);
__attribute__((format (printf, 2, 3))) __attribute__((format (printf, 2, 3)))
int get_oidf(struct object_id *oid, const char *fmt, ...); int get_oidf(struct object_id *oid, const char *fmt, ...);