Re: [RFC PATCH 04/10] pack: move open_pack_index(), parse_pack_index()
From: Junio C Hamano <hidden>
Date: 2017-08-08 20:19:30
Jonathan Tan [off-list ref] writes:
Signed-off-by: Jonathan Tan <redacted> --- builtin/count-objects.c | 1 + cache.h | 8 --- pack.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++ pack.h | 8 +++ sha1_file.c | 140 --------------------------------------------- sha1_name.c | 1 + 6 files changed, 159 insertions(+), 148 deletions(-)
This patch is a bit strange...
quoted hunk
diff --git a/pack.c b/pack.c index 60d9fc3b0..6edc43228 100644 --- a/pack.c +++ b/pack.c... +static struct packed_git *alloc_packed_git(int extra) +{ + struct packed_git *p = xmalloc(st_add(sizeof(*p), extra)); + memset(p, 0, sizeof(*p)); + p->pack_fd = -1; + return p; +} + +struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path) +{ + const char *path = sha1_pack_name(sha1); + size_t alloc = st_add(strlen(path), 1); + struct packed_git *p = alloc_packed_git(alloc); + + memcpy(p->pack_name, path, alloc); /* includes NUL */ + hashcpy(p->sha1, sha1); + if (check_packed_git_idx(idx_path, p)) { + free(p); + return NULL; + } + + return p; +}
We see these two functions appear in pack.c
quoted hunk
diff --git a/sha1_file.c b/sha1_file.c index 0de39f480..2e414f5f5 100644 --- a/sha1_file.c +++ b/sha1_file.c...@@ -1300,22 +1176,6 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local) return p; } -struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path) -{ - const char *path = sha1_pack_name(sha1); - size_t alloc = st_add(strlen(path), 1); - struct packed_git *p = alloc_packed_git(alloc); - - memcpy(p->pack_name, path, alloc); /* includes NUL */ - hashcpy(p->sha1, sha1); - if (check_packed_git_idx(idx_path, p)) { - free(p); - return NULL; - } - - return p; -} -
And we see parse_pack_index() came from sha1_file.c
But where did alloc_packed_git() come from? Was the patch split
incorrectly or something?
When I applied the whole series and did
git blame -s -w -M -C -C master.. pack.c
expecting that pretty much everything has come from sha1_file.c but
noticed that some lines were actually blamed to a version of pack.c
and these functions were among them.