зеркало из https://github.com/microsoft/git.git
commit: add repository argument to parse_commit_buffer
Add a repository argument to allow the callers of parse_commit_buffer to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c1f5eb4962
Коммит
08f4f44501
4
commit.c
4
commit.c
|
@ -363,7 +363,7 @@ const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph)
|
||||
int parse_commit_buffer_the_repository(struct commit *item, const void *buffer, unsigned long size, int check_graph)
|
||||
{
|
||||
const char *tail = buffer;
|
||||
const char *bufptr = buffer;
|
||||
|
@ -448,7 +448,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
|
|||
return error("Object %s not a commit",
|
||||
oid_to_hex(&item->object.oid));
|
||||
}
|
||||
ret = parse_commit_buffer(item, buffer, size, 0);
|
||||
ret = parse_commit_buffer(the_repository, item, buffer, size, 0);
|
||||
if (save_commit_buffer && !ret) {
|
||||
set_commit_buffer(item, buffer, size);
|
||||
return 0;
|
||||
|
|
3
commit.h
3
commit.h
|
@ -82,7 +82,8 @@ struct commit *lookup_commit_reference_by_name(const char *name);
|
|||
*/
|
||||
struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
|
||||
|
||||
int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph);
|
||||
#define parse_commit_buffer(r, i, b, s, g) parse_commit_buffer_##r(i, b, s, g)
|
||||
int parse_commit_buffer_the_repository(struct commit *item, const void *buffer, unsigned long size, int check_graph);
|
||||
int parse_commit_gently(struct commit *item, int quiet_on_missing);
|
||||
static inline int parse_commit(struct commit *item)
|
||||
{
|
||||
|
|
2
object.c
2
object.c
|
@ -214,7 +214,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
|
|||
} else if (type == OBJ_COMMIT) {
|
||||
struct commit *commit = lookup_commit(the_repository, oid);
|
||||
if (commit) {
|
||||
if (parse_commit_buffer(commit, buffer, size, 1))
|
||||
if (parse_commit_buffer(the_repository, commit, buffer, size, 1))
|
||||
return NULL;
|
||||
if (!get_cached_commit_buffer(commit, NULL)) {
|
||||
set_commit_buffer(commit, buffer, size);
|
||||
|
|
|
@ -1801,7 +1801,7 @@ static void check_commit(const void *buf, size_t size)
|
|||
{
|
||||
struct commit c;
|
||||
memset(&c, 0, sizeof(c));
|
||||
if (parse_commit_buffer(&c, buf, size, 0))
|
||||
if (parse_commit_buffer(the_repository, &c, buf, size, 0))
|
||||
die("corrupt commit");
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче