kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

refs: convert dwim_log to struct object_id 

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2017-10-15 22:06:59 +00:00 committed by Junio C Hamano
parent b8acac54c8
commit 334dc52f49
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/reflog.c
View File

@ -602,7 +602,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
for (; i < argc; i++) { for (; i < argc; i++) {
char *ref; char *ref;
struct object_id oid; 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]); status |= error("%s points nowhere!", argv[i]);
continue; continue;
} }
@ -668,7 +668,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
continue; 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]); status |= error("no reflog for '%s'", argv[i]);
continue; continue;
} }

2
reflog-walk.c
View File

@ -161,7 +161,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
struct object_id oid; struct object_id oid;
char *b; char *b;
int ret = dwim_log(branch, strlen(branch), int ret = dwim_log(branch, strlen(branch),
oid.hash, &b); &oid, &b);
if (ret > 1) if (ret > 1)
free(b); free(b);
else if (ret == 1) { else if (ret == 1) {

8
refs.c
View File

@ -497,7 +497,7 @@ int expand_ref(const char *str, int len, struct object_id *oid, char **ref)
return refs_found; 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); char *last_branch = substitute_branch_name(&str, &len);
const char **p; const char **p;
@ -506,13 +506,13 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)


*log = NULL; *log = NULL;
for (p = ref_rev_parse_rules; *p; p++) { for (p = ref_rev_parse_rules; *p; p++) {
unsigned char hash[20]; struct object_id hash;
const char *ref, *it; const char *ref, *it;


strbuf_reset(&path); strbuf_reset(&path);
strbuf_addf(&path, *p, len, str); strbuf_addf(&path, *p, len, str);
ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING, ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING,
hash, NULL); hash.hash, NULL);
if (!ref) if (!ref)
continue; continue;
if (reflog_exists(path.buf)) if (reflog_exists(path.buf))
@ -523,7 +523,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
continue; continue;
if (!logs_found++) { if (!logs_found++) {
*log = xstrdup(it); *log = xstrdup(it);
hashcpy(sha1, hash); oidcpy(oid, &hash);
} }
if (!warn_ambiguous_refs) if (!warn_ambiguous_refs)
break; break;

2
refs.h
View File

@ -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 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_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 * A ref_transaction represents a collection of reference updates that

2
sha1_name.c
View File

@ -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 */ /* allow "@{...}" to mean the current branch reflog */
refs_found = dwim_ref("HEAD", 4, oid, &real_ref); refs_found = dwim_ref("HEAD", 4, oid, &real_ref);
else if (reflog_len) else if (reflog_len)
refs_found = dwim_log(str, len, oid->hash, &real_ref); refs_found = dwim_log(str, len, oid, &real_ref);
else else
refs_found = dwim_ref(str, len, oid, &real_ref); refs_found = dwim_ref(str, len, oid, &real_ref);