development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/fsck-retire-require-eoh' into maint

Browse source 
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:
Junio C Hamano 2015-07-27 12:21:45 -07:00
parent c18593658e 84d18c0bcf
commit bde6a72af5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fsck.c
View file

@ -241,8 +241,8 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)
return retval;
}
static int require_end_of_header(const void *data, unsigned long size,
struct object *obj, fsck_error error_func)
static int verify_headers(const void *data, unsigned long size,
struct object *obj, fsck_error error_func)
{
const char *buffer = (const char *)data;
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");
}
@ -308,7 +317,7 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
unsigned parent_count, parent_line_count = 0;
int err;
if (require_end_of_header(buffer, size, &commit->object, error_func))
if (verify_headers(buffer, size, &commit->object, error_func))
return -1;
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;
if (!skip_prefix(buffer, "object ", &buffer)) {