Skip to content

Commit 0bca165

Browse files
peffgitster
authored andcommitted
validate_headref: use get_oid_hex for detached HEADs
If a candidate HEAD isn't a symref, we check that it contains a viable sha1. But in a post-sha1 world, we should be checking whether it has any plausible object-id. We can do that by switching to get_oid_hex(). Note that both before and after this patch, we only check for a plausible object id at the start of the file, and then call that good enough. We ignore any content _after_ the hex, so a string like: 0123456789012345678901234567890123456789 foo is accepted. Though we do put extra bytes like this into some pseudorefs (e.g., FETCH_HEAD), we don't typically do so with HEAD. We could tighten this up by using parse_oid_hex(), like: if (!parse_oid_hex(buffer, &oid, &end) && *end++ == '\n' && *end == '\0') return 0; But we're probably better to remain on the loose side. We're just checking here for a plausible-looking repository directory, so heuristics are acceptable (if we really want to be meticulous, we should use the actual ref code to parse HEAD). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7eb4b9d commit 0bca165

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

path.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ int validate_headref(const char *path)
638638
struct stat st;
639639
char buffer[256];
640640
const char *refname;
641-
unsigned char sha1[20];
641+
struct object_id oid;
642642
int fd;
643643
ssize_t len;
644644

@@ -679,7 +679,7 @@ int validate_headref(const char *path)
679679
/*
680680
* Is this a detached HEAD?
681681
*/
682-
if (!get_sha1_hex(buffer, sha1))
682+
if (!get_oid_hex(buffer, &oid))
683683
return 0;
684684

685685
return -1;

0 commit comments

Comments
 (0)