mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 06:36:11 +02:00
Code

sha1_name.c: teach get_short_sha1() a commit-only option 

When the caller knows that the parameter is meant to name a commit,
e.g. "56789a" in describe name "v1.2.3-4-g56789a", pass that as a
hint so that lower level can use it to disambiguate objects when
there is only one commit whose name begins with 56789a even if there
are objects of other types whose names share the same prefix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-06-20 23:03:09 -07:00
parent 37c00e5590
commit aa1dec9ef6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -812,6 +812,7 @@ struct object_context {
};
#define GET_SHA1_QUIETLY 01
#define GET_SHA1_COMMIT 02
extern int get_sha1(const char *str, unsigned char *sha1);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);

9
sha1_name.c
View File

@ -218,6 +218,12 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
return 0;
}
static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
{
int kind = sha1_object_info(sha1, NULL);
return kind == OBJ_COMMIT;
}
static int get_short_sha1(const char *name, int len, unsigned char *sha1,
unsigned flags)
{
@ -253,6 +259,9 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
prepare_alt_odb();
memset(&ds, 0, sizeof(ds));
if (flags & GET_SHA1_COMMIT)
ds.fn = disambiguate_commit_only;
find_short_object_filename(len, hex_pfx, &ds);
find_short_packed_object(len, bin_pfx, &ds);
status = finish_object_disambiguation(&ds, sha1);