diff options
| -rw-r--r-- | builtin/reflog.c | 4 | ||||
| -rw-r--r-- | reflog-walk.c | 2 | ||||
| -rw-r--r-- | refs.c | 8 | ||||
| -rw-r--r-- | refs.h | 2 | ||||
| -rw-r--r-- | sha1_name.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 302fafbeef..cd4c4847b7 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -602,7 +602,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) for (; i < argc; i++) { char *ref; struct object_id oid; - if (!dwim_log(argv[i], strlen(argv[i]), oid.hash, &ref)) { + if (!dwim_log(argv[i], strlen(argv[i]), &oid, &ref)) { status |= error("%s points nowhere!", argv[i]); continue; } @@ -668,7 +668,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix) continue; } - if (!dwim_log(argv[i], spec - argv[i], oid.hash, &ref)) { + if (!dwim_log(argv[i], spec - argv[i], &oid, &ref)) { status |= error("no reflog for '%s'", argv[i]); continue; } diff --git a/reflog-walk.c b/reflog-walk.c index 842b2f77dc..5008bbf6ad 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -161,7 +161,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info, struct object_id oid; char *b; int ret = dwim_log(branch, strlen(branch), - oid.hash, &b); + &oid, &b); if (ret > 1) free(b); else if (ret == 1) { @@ -497,7 +497,7 @@ int expand_ref(const char *str, int len, struct object_id *oid, char **ref) return refs_found; } -int dwim_log(const char *str, int len, unsigned char *sha1, char **log) +int dwim_log(const char *str, int len, struct object_id *oid, char **log) { char *last_branch = substitute_branch_name(&str, &len); const char **p; @@ -506,13 +506,13 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) *log = NULL; for (p = ref_rev_parse_rules; *p; p++) { - unsigned char hash[20]; + struct object_id hash; const char *ref, *it; strbuf_reset(&path); strbuf_addf(&path, *p, len, str); ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING, - hash, NULL); + hash.hash, NULL); if (!ref) continue; if (reflog_exists(path.buf)) @@ -523,7 +523,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) continue; if (!logs_found++) { *log = xstrdup(it); - hashcpy(sha1, hash); + oidcpy(oid, &hash); } if (!warn_ambiguous_refs) break; @@ -141,7 +141,7 @@ int refname_match(const char *abbrev_name, const char *full_name); int expand_ref(const char *str, int len, struct object_id *oid, char **ref); int dwim_ref(const char *str, int len, struct object_id *oid, char **ref); -int dwim_log(const char *str, int len, unsigned char *sha1, char **ref); +int dwim_log(const char *str, int len, struct object_id *oid, char **ref); /* * A ref_transaction represents a collection of reference updates that diff --git a/sha1_name.c b/sha1_name.c index d8ff831759..514915460f 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -656,7 +656,7 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid, /* allow "@{...}" to mean the current branch reflog */ refs_found = dwim_ref("HEAD", 4, oid, &real_ref); else if (reflog_len) - refs_found = dwim_log(str, len, oid->hash, &real_ref); + refs_found = dwim_log(str, len, oid, &real_ref); else refs_found = dwim_ref(str, len, oid, &real_ref); |