mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'jc/fsck-retire-require-eoh' into maint
A fix to a minor regression to "git fsck" in v2.2 era that started complaining about a body-less tag object when it lacks a separator empty line after its header to separate it with a non-existent body. * jc/fsck-retire-require-eoh: fsck: it is OK for a tag and a commit to lack the body
This commit is contained in:
commit
bde6a72af5
17
fsck.c
17
fsck.c
|
@ -241,8 +241,8 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int require_end_of_header(const void *data, unsigned long size,
|
static int verify_headers(const void *data, unsigned long size,
|
||||||
struct object *obj, fsck_error error_func)
|
struct object *obj, fsck_error error_func)
|
||||||
{
|
{
|
||||||
const char *buffer = (const char *)data;
|
const char *buffer = (const char *)data;
|
||||||
unsigned long i;
|
unsigned long i;
|
||||||
|
@ -258,6 +258,15 @@ static int require_end_of_header(const void *data, unsigned long size,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We did not find double-LF that separates the header
|
||||||
|
* and the body. Not having a body is not a crime but
|
||||||
|
* we do want to see the terminating LF for the last header
|
||||||
|
* line.
|
||||||
|
*/
|
||||||
|
if (size && buffer[size - 1] == '\n')
|
||||||
|
return 0;
|
||||||
|
|
||||||
return error_func(obj, FSCK_ERROR, "unterminated header");
|
return error_func(obj, FSCK_ERROR, "unterminated header");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,7 +317,7 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
|
||||||
unsigned parent_count, parent_line_count = 0;
|
unsigned parent_count, parent_line_count = 0;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (require_end_of_header(buffer, size, &commit->object, error_func))
|
if (verify_headers(buffer, size, &commit->object, error_func))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (!skip_prefix(buffer, "tree ", &buffer))
|
if (!skip_prefix(buffer, "tree ", &buffer))
|
||||||
|
@ -387,7 +396,7 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (require_end_of_header(buffer, size, &tag->object, error_func))
|
if (verify_headers(buffer, size, &tag->object, error_func))
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
if (!skip_prefix(buffer, "object ", &buffer)) {
|
if (!skip_prefix(buffer, "object ", &buffer)) {
|
||||||
|
|
Loading…
Reference in a new issue