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

Convert check_connected to use struct object_id

Browse Source 
Convert check_connected and the callbacks it takes to use 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 2017-10-15 22:06:54 +00:00 committed by Junio C Hamano
parent 89f3bbdd3b
commit 6ccac9eed5
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/clone.c
View File

@ -615,7 +615,7 @@ static void write_followtags(const struct ref *refs, const char *msg)
} }
} }
static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) static int iterate_ref_map(void *cb_data, struct object_id *oid)
{ {
struct ref **rm = cb_data; struct ref **rm = cb_data;
struct ref *ref = *rm; struct ref *ref = *rm;
@ -630,7 +630,7 @@ static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
if (!ref) if (!ref)
return -1; return -1;
hashcpy(sha1, ref->old_oid.hash); oidcpy(oid, &ref->old_oid);
*rm = ref->next; *rm = ref->next;
return 0; return 0;
} }

4
builtin/fetch.c
View File

@ -727,7 +727,7 @@ static int update_local_ref(struct ref *ref,
} }
} }
static int iterate_ref_map(void *cb_data, unsigned char sha1[20]) static int iterate_ref_map(void *cb_data, struct object_id *oid)
{ {
struct ref **rm = cb_data; struct ref **rm = cb_data;
struct ref *ref = *rm; struct ref *ref = *rm;
@ -737,7 +737,7 @@ static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
if (!ref) if (!ref)
return -1; /* end of the list */ return -1; /* end of the list */
*rm = ref->next; *rm = ref->next;
hashcpy(sha1, ref->old_oid.hash); oidcpy(oid, &ref->old_oid);
return 0; return 0;
} }

10
builtin/receive-pack.c
View File

@ -870,7 +870,7 @@ static void refuse_unconfigured_deny_delete_current(void)
rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg)); rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
} }
static int command_singleton_iterator(void *cb_data, unsigned char sha1[20]); static int command_singleton_iterator(void *cb_data, struct object_id *oid);
static int update_shallow_ref(struct command *cmd, struct shallow_info *si) static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
{ {
static struct lock_file shallow_lock; static struct lock_file shallow_lock;
@ -1270,7 +1270,7 @@ static void check_aliased_updates(struct command *commands)
string_list_clear(&ref_list, 0); string_list_clear(&ref_list, 0);
} }
static int command_singleton_iterator(void *cb_data, unsigned char sha1[20]) static int command_singleton_iterator(void *cb_data, struct object_id *oid)
{ {
struct command **cmd_list = cb_data; struct command **cmd_list = cb_data;
struct command *cmd = *cmd_list; struct command *cmd = *cmd_list;
@ -1278,7 +1278,7 @@ static int command_singleton_iterator(void *cb_data, unsigned char sha1[20])
if (!cmd || is_null_oid(&cmd->new_oid)) if (!cmd || is_null_oid(&cmd->new_oid))
return -1; /* end of list */ return -1; /* end of list */
*cmd_list = NULL; /* this returns only one */ *cmd_list = NULL; /* this returns only one */
hashcpy(sha1, cmd->new_oid.hash); oidcpy(oid, &cmd->new_oid);
return 0; return 0;
} }
@ -1309,7 +1309,7 @@ struct iterate_data {
struct shallow_info *si; struct shallow_info *si;
}; };
static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20]) static int iterate_receive_command_list(void *cb_data, struct object_id *oid)
{ {
struct iterate_data *data = cb_data; struct iterate_data *data = cb_data;
struct command **cmd_list = &data->cmds; struct command **cmd_list = &data->cmds;
@ -1320,7 +1320,7 @@ static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20])
/* to be checked in update_shallow_ref() */ /* to be checked in update_shallow_ref() */
continue; continue;
if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) { if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {
hashcpy(sha1, cmd->new_oid.hash); oidcpy(oid, &cmd->new_oid);
*cmd_list = cmd->next; *cmd_list = cmd->next;
return 0; return 0;
} }

18
connected.c
View File

@ -16,13 +16,13 @@
* *
* Returns 0 if everything is connected, non-zero otherwise. * Returns 0 if everything is connected, non-zero otherwise.
*/ */
int check_connected(sha1_iterate_fn fn, void *cb_data, int check_connected(oid_iterate_fn fn, void *cb_data,
struct check_connected_options *opt) struct check_connected_options *opt)
{ {
struct child_process rev_list = CHILD_PROCESS_INIT; struct child_process rev_list = CHILD_PROCESS_INIT;
struct check_connected_options defaults = CHECK_CONNECTED_INIT; struct check_connected_options defaults = CHECK_CONNECTED_INIT;
char commit[41]; char commit[GIT_MAX_HEXSZ + 1];
unsigned char sha1[20]; struct object_id oid;
int err = 0; int err = 0;
struct packed_git *new_pack = NULL; struct packed_git *new_pack = NULL;
struct transport *transport; struct transport *transport;
@ -32,7 +32,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
opt = &defaults; opt = &defaults;
transport = opt->transport; transport = opt->transport;
if (fn(cb_data, sha1)) { if (fn(cb_data, &oid)) {
if (opt->err_fd) if (opt->err_fd)
close(opt->err_fd); close(opt->err_fd);
return err; return err;
@ -77,7 +77,7 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
sigchain_push(SIGPIPE, SIG_IGN); sigchain_push(SIGPIPE, SIG_IGN);
commit[40] = '\n'; commit[GIT_SHA1_HEXSZ] = '\n';
do { do {
/* /*
* If index-pack already checked that: * If index-pack already checked that:
@ -87,17 +87,17 @@ int check_connected(sha1_iterate_fn fn, void *cb_data,
* are sure the ref is good and not sending it to * are sure the ref is good and not sending it to
* rev-list for verification. * rev-list for verification.
*/ */
if (new_pack && find_pack_entry_one(sha1, new_pack)) if (new_pack && find_pack_entry_one(oid.hash, new_pack))
continue; continue;
memcpy(commit, sha1_to_hex(sha1), 40); memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
if (write_in_full(rev_list.in, commit, 41) < 0) { if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
if (errno != EPIPE && errno != EINVAL) if (errno != EPIPE && errno != EINVAL)
error_errno(_("failed write to rev-list")); error_errno(_("failed write to rev-list"));
err = -1; err = -1;
break; break;
} }
} while (!fn(cb_data, sha1)); } while (!fn(cb_data, &oid));
if (close(rev_list.in)) if (close(rev_list.in))
err = error_errno(_("failed to close rev-list's stdin")); err = error_errno(_("failed to close rev-list's stdin"));

4
connected.h
View File

@ -8,7 +8,7 @@ struct transport;
* When called after returning the name for the last object, return -1 * When called after returning the name for the last object, return -1
* to signal EOF, otherwise return 0. * to signal EOF, otherwise return 0.
*/ */
typedef int (*sha1_iterate_fn)(void *, unsigned char [20]); typedef int (*oid_iterate_fn)(void *, struct object_id *oid);
/* /*
* Named-arguments struct for check_connected. All arguments are * Named-arguments struct for check_connected. All arguments are
@ -51,7 +51,7 @@ struct check_connected_options {
* *
* If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed. * If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
*/ */
int check_connected(sha1_iterate_fn fn, void *cb_data, int check_connected(oid_iterate_fn fn, void *cb_data,
struct check_connected_options *opt); struct check_connected_options *opt);
#endif /* CONNECTED_H */ #endif /* CONNECTED_H */