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

sha1-name.c: remove the_repo from get_oid_oneline()

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2019-04-16 16:33:29 +07:00 committed by Junio C Hamano
parent 71588ed2c0
commit 0bb41a1985
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sha1-name.c
View File

@ -15,7 +15,7 @@
#include "midx.h" #include "midx.h"
#include "commit-reach.h" #include "commit-reach.h"
static int get_oid_oneline(const char *, struct object_id *, struct commit_list *); static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *);
typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *); typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *);
@ -1090,7 +1090,7 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1)); prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
commit_list_insert((struct commit *)o, &list); commit_list_insert((struct commit *)o, &list);
ret = get_oid_oneline(prefix, oid, list); ret = get_oid_oneline(the_repository, prefix, oid, list);
free(prefix); free(prefix);
return ret; return ret;
} }
@ -1204,8 +1204,9 @@ static int handle_one_ref(const char *path, const struct object_id *oid,
return 0; return 0;
} }
static int get_oid_oneline(const char *prefix, struct object_id *oid, static int get_oid_oneline(struct repository *r,
struct commit_list *list) const char *prefix, struct object_id *oid,
struct commit_list *list)
{ {
struct commit_list *backup = NULL, *l; struct commit_list *backup = NULL, *l;
int found = 0; int found = 0;
@ -1236,7 +1237,7 @@ static int get_oid_oneline(const char *prefix, struct object_id *oid,
int matches; int matches;
commit = pop_most_recent_commit(&list, ONELINE_SEEN); commit = pop_most_recent_commit(&list, ONELINE_SEEN);
if (!parse_object(the_repository, &commit->object.oid)) if (!parse_object(r, &commit->object.oid))
continue; continue;
buf = get_commit_buffer(commit, NULL); buf = get_commit_buffer(commit, NULL);
p = strstr(buf, "\n\n"); p = strstr(buf, "\n\n");
@ -1760,7 +1761,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
for_each_ref(handle_one_ref, &list); for_each_ref(handle_one_ref, &list);
head_ref(handle_one_ref, &list); head_ref(handle_one_ref, &list);
commit_list_sort_by_date(&list); commit_list_sort_by_date(&list);
return get_oid_oneline(name + 2, oid, list); return get_oid_oneline(repo, name + 2, oid, list);
} }
if (namelen < 3 || if (namelen < 3 ||
name[2] != ':' || name[2] != ':' ||