Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin/reflog: rewrite ref functions to take an object_id argument
author
Michael Haggerty
<mhagger@alum.mit.edu>
Mon, 25 May 2015 18:38:40 +0000
(18:38 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 May 2015 19:19:30 +0000
(12:19 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reflog.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ce2a987
)
diff --git
a/builtin/reflog.c
b/builtin/reflog.c
index 1163dd65ee7d0bbc5976d53f4840336bd6538160..c2eb8ff8402068d7480a3afd262219cb03841ae1 100644
(file)
--- a/
builtin/reflog.c
+++ b/
builtin/reflog.c
@@
-313,14
+313,14
@@
static int should_expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
return 0;
}
return 0;
}
-static int push_tip_to_list(const char *refname, const
unsigned char *sha1
,
+static int push_tip_to_list(const char *refname, const
struct object_id *oid
,
int flags, void *cb_data)
{
struct commit_list **list = cb_data;
struct commit *tip_commit;
if (flags & REF_ISSYMREF)
return 0;
int flags, void *cb_data)
{
struct commit_list **list = cb_data;
struct commit *tip_commit;
if (flags & REF_ISSYMREF)
return 0;
- tip_commit = lookup_commit_reference_gently(
sha1
, 1);
+ tip_commit = lookup_commit_reference_gently(
oid->hash
, 1);
if (!tip_commit)
return 0;
commit_list_insert(tip_commit, list);
if (!tip_commit)
return 0;
commit_list_insert(tip_commit, list);
@@
-352,10
+352,8
@@
static void reflog_expiry_prepare(const char *refname,
if (cb->unreachable_expire_kind != UE_ALWAYS) {
if (cb->unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
if (cb->unreachable_expire_kind != UE_ALWAYS) {
if (cb->unreachable_expire_kind == UE_HEAD) {
struct commit_list *elem;
- struct each_ref_fn_sha1_adapter wrapped_push_tip_to_list =
- {push_tip_to_list, &cb->tips};
- for_each_ref(
each_ref_fn_adapter, &wrapped_push_tip_to_list
);
+ for_each_ref(
push_tip_to_list, &cb->tips
);
for (elem = cb->tips; elem; elem = elem->next)
commit_list_insert(elem->item, &cb->mark_list);
} else {
for (elem = cb->tips; elem; elem = elem->next)
commit_list_insert(elem->item, &cb->mark_list);
} else {
@@
-382,14
+380,14
@@
static void reflog_expiry_cleanup(void *cb_data)
}
}
}
}
-static int collect_reflog(const char *ref, const
unsigned char *sha1
, int unused, void *cb_data)
+static int collect_reflog(const char *ref, const
struct object_id *oid
, int unused, void *cb_data)
{
struct collected_reflog *e;
struct collect_reflog_cb *cb = cb_data;
size_t namelen = strlen(ref);
e = xmalloc(sizeof(*e) + namelen + 1);
{
struct collected_reflog *e;
struct collect_reflog_cb *cb = cb_data;
size_t namelen = strlen(ref);
e = xmalloc(sizeof(*e) + namelen + 1);
- hashcpy(e->sha1,
sha1
);
+ hashcpy(e->sha1,
oid->hash
);
memcpy(e->reflog, ref, namelen + 1);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
memcpy(e->reflog, ref, namelen + 1);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
@@
-591,11
+589,9
@@
static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
if (do_all) {
struct collect_reflog_cb collected;
int i;
if (do_all) {
struct collect_reflog_cb collected;
int i;
- struct each_ref_fn_sha1_adapter wrapped_collect_reflog =
- {collect_reflog, &collected};
memset(&collected, 0, sizeof(collected));
memset(&collected, 0, sizeof(collected));
- for_each_reflog(
each_ref_fn_adapter, &wrapped_collect_reflog
);
+ for_each_reflog(
collect_reflog, &collected
);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
for (i = 0; i < collected.nr; i++) {
struct collected_reflog *e = collected.e[i];
set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);