undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree: convert read_tree_recursive to struct object_id

Browse Source 
Convert the callback functions for read_tree_recursive to take a pointer
to struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2018-03-12 02:27:26 +00:00 committed by Junio C Hamano
parent 5ac913c6eb
commit df46d77e00
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archive.c
View File

@ -198,7 +198,7 @@ static int write_directory(struct archiver_context *c)
return ret ? -1 : 0; return ret ? -1 : 0;
} }
static int queue_or_write_archive_entry(const unsigned char *sha1, static int queue_or_write_archive_entry(const struct object_id *oid,
struct strbuf *base, const char *filename, struct strbuf *base, const char *filename,
unsigned mode, int stage, void *context) unsigned mode, int stage, void *context)
{ {
@ -224,14 +224,14 @@ static int queue_or_write_archive_entry(const unsigned char *sha1,
if (check_attr_export_ignore(check)) if (check_attr_export_ignore(check))
return 0; return 0;
queue_directory(sha1, base, filename, queue_directory(oid->hash, base, filename,
mode, stage, c); mode, stage, c);
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;
} }
if (write_directory(c)) if (write_directory(c))
return -1; return -1;
return write_archive_entry(sha1, base->buf, base->len, filename, mode, return write_archive_entry(oid->hash, base->buf, base->len, filename, mode,
stage, context); stage, context);
} }
@ -303,7 +303,7 @@ static const struct archiver *lookup_archiver(const char *name)
return NULL; return NULL;
} }
static int reject_entry(const unsigned char *sha1, struct strbuf *base, static int reject_entry(const struct object_id *oid, struct strbuf *base,
const char *filename, unsigned mode, const char *filename, unsigned mode,
int stage, void *context) int stage, void *context)
{ {

4
builtin/checkout.c
View File

@ -66,7 +66,7 @@ static int post_checkout_hook(struct commit *old_commit, struct commit *new_comm
} }
static int update_some(const unsigned char *sha1, struct strbuf *base, static int update_some(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *context) const char *pathname, unsigned mode, int stage, void *context)
{ {
int len; int len;
@ -78,7 +78,7 @@ static int update_some(const unsigned char *sha1, struct strbuf *base,
len = base->len + strlen(pathname); len = base->len + strlen(pathname);
ce = xcalloc(1, cache_entry_size(len)); ce = xcalloc(1, cache_entry_size(len));
hashcpy(ce->oid.hash, sha1); oidcpy(&ce->oid, oid);
memcpy(ce->name, base->buf, base->len); memcpy(ce->name, base->buf, base->len);
memcpy(ce->name + base->len, pathname, len - base->len); memcpy(ce->name + base->len, pathname, len - base->len);
ce->ce_flags = create_ce_flags(0) | CE_UPDATE; ce->ce_flags = create_ce_flags(0) | CE_UPDATE;

2
builtin/log.c
View File

@ -541,7 +541,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
return 0; return 0;
} }
static int show_tree_object(const unsigned char *sha1, static int show_tree_object(const struct object_id *oid,
struct strbuf *base, struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *context) const char *pathname, unsigned mode, int stage, void *context)
{ {

8
builtin/ls-tree.c
View File

@ -60,7 +60,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
return 0; return 0;
} }
static int show_tree(const unsigned char *sha1, struct strbuf *base, static int show_tree(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, int stage, void *context) const char *pathname, unsigned mode, int stage, void *context)
{ {
int retval = 0; int retval = 0;
@ -94,7 +94,7 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
char size_text[24]; char size_text[24];
if (!strcmp(type, blob_type)) { if (!strcmp(type, blob_type)) {
unsigned long size; unsigned long size;
if (sha1_object_info(sha1, &size) == OBJ_BAD) if (sha1_object_info(oid->hash, &size) == OBJ_BAD)
xsnprintf(size_text, sizeof(size_text), xsnprintf(size_text, sizeof(size_text),
"BAD"); "BAD");
else else
@ -103,11 +103,11 @@ static int show_tree(const unsigned char *sha1, struct strbuf *base,
} else } else
xsnprintf(size_text, sizeof(size_text), "-"); xsnprintf(size_text, sizeof(size_text), "-");
printf("%06o %s %s %7s\t", mode, type, printf("%06o %s %s %7s\t", mode, type,
find_unique_abbrev(sha1, abbrev), find_unique_abbrev(oid->hash, abbrev),
size_text); size_text);
} else } else
printf("%06o %s %s\t", mode, type, printf("%06o %s %s\t", mode, type,
find_unique_abbrev(sha1, abbrev)); find_unique_abbrev(oid->hash, abbrev));
} }
baselen = base->len; baselen = base->len;
strbuf_addstr(base, pathname); strbuf_addstr(base, pathname);

2
merge-recursive.c
View File

@ -335,7 +335,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
return result; return result;
} }
static int save_files_dirs(const unsigned char *sha1, static int save_files_dirs(const struct object_id *oid,
struct strbuf *base, const char *path, struct strbuf *base, const char *path,
unsigned int mode, int stage, void *context) unsigned int mode, int stage, void *context)
{ {

14
tree.c
View File

@ -10,7 +10,7 @@
const char *tree_type = "tree"; const char *tree_type = "tree";
static int read_one_entry_opt(struct index_state *istate, static int read_one_entry_opt(struct index_state *istate,
const unsigned char *sha1, const struct object_id *oid,
const char *base, int baselen, const char *base, int baselen,
const char *pathname, const char *pathname,
unsigned mode, int stage, int opt) unsigned mode, int stage, int opt)
@ -31,16 +31,16 @@ static int read_one_entry_opt(struct index_state *istate,
ce->ce_namelen = baselen + len; ce->ce_namelen = baselen + len;
memcpy(ce->name, base, baselen); memcpy(ce->name, base, baselen);
memcpy(ce->name + baselen, pathname, len+1); memcpy(ce->name + baselen, pathname, len+1);
hashcpy(ce->oid.hash, sha1); oidcpy(&ce->oid, oid);
return add_index_entry(istate, ce, opt); return add_index_entry(istate, ce, opt);
} }
static int read_one_entry(const unsigned char *sha1, struct strbuf *base, static int read_one_entry(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, int stage, const char *pathname, unsigned mode, int stage,
void *context) void *context)
{ {
struct index_state *istate = context; struct index_state *istate = context;
return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname, return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
mode, stage, mode, stage,
ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK); ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
} }
@ -49,12 +49,12 @@ static int read_one_entry(const unsigned char *sha1, struct strbuf *base,
* This is used when the caller knows there is no existing entries at * This is used when the caller knows there is no existing entries at
* the stage that will conflict with the entry being added. * the stage that will conflict with the entry being added.
*/ */
static int read_one_entry_quick(const unsigned char *sha1, struct strbuf *base, static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
const char *pathname, unsigned mode, int stage, const char *pathname, unsigned mode, int stage,
void *context) void *context)
{ {
struct index_state *istate = context; struct index_state *istate = context;
return read_one_entry_opt(istate, sha1, base->buf, base->len, pathname, return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
mode, stage, mode, stage,
ADD_CACHE_JUST_APPEND); ADD_CACHE_JUST_APPEND);
} }
@ -83,7 +83,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
continue; continue;
} }
switch (fn(entry.oid->hash, base, switch (fn(entry.oid, base,
entry.path, entry.mode, stage, context)) { entry.path, entry.mode, stage, context)) {
case 0: case 0:
continue; continue;

2
tree.h
View File

@ -27,7 +27,7 @@ void free_tree_buffer(struct tree *tree);
struct tree *parse_tree_indirect(const struct object_id *oid); struct tree *parse_tree_indirect(const struct object_id *oid);
#define READ_TREE_RECURSIVE 1 #define READ_TREE_RECURSIVE 1
typedef int (*read_tree_fn_t)(const unsigned char *, struct strbuf *, const char *, unsigned int, int, void *); typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
extern int read_tree_recursive(struct tree *tree, extern int read_tree_recursive(struct tree *tree,
const char *base, int baselen, const char *base, int baselen,