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

get_sha1_oneline: make callers prepare the commit list to traverse

Browse Source 
This gives callers more control, i.e. which ref will be searched from.
They must prepare the list ordered by committer date.

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 2010-12-13 10:01:14 +07:00 committed by Junio C Hamano
parent 28042dbcd6
commit 84baa31bcb
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sha1_name.c
View File

@ -686,13 +686,13 @@ static int handle_one_ref(const char *path,
if (object->type != OBJ_COMMIT) if (object->type != OBJ_COMMIT)
return 0; return 0;
insert_by_date((struct commit *)object, list); insert_by_date((struct commit *)object, list);
object->flags |= ONELINE_SEEN;
return 0; return 0;
} }
static int get_sha1_oneline(const char *prefix, unsigned char *sha1) static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
struct commit_list *list)
{ {
struct commit_list *list = NULL, *backup = NULL, *l; struct commit_list *backup = NULL, *l;
int found = 0; int found = 0;
regex_t regex; regex_t regex;
@ -705,9 +705,10 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
if (regcomp(&regex, prefix, REG_EXTENDED)) if (regcomp(&regex, prefix, REG_EXTENDED))
die("Invalid search pattern: %s", prefix); die("Invalid search pattern: %s", prefix);
for_each_ref(handle_one_ref, &list); for (l = list; l; l = l->next) {
for (l = list; l; l = l->next) l->item->object.flags |= ONELINE_SEEN;
commit_list_insert(l->item, &backup); commit_list_insert(l->item, &backup);
}
while (list) { while (list) {
char *p, *to_free = NULL; char *p, *to_free = NULL;
struct commit *commit; struct commit *commit;
@ -1090,9 +1091,11 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
int stage = 0; int stage = 0;
struct cache_entry *ce; struct cache_entry *ce;
int pos; int pos;
if (namelen > 2 && name[1] == '/') if (namelen > 2 && name[1] == '/') {
/* don't need mode for commit */ struct commit_list *list = NULL;
return get_sha1_oneline(name + 2, sha1); for_each_ref(handle_one_ref, &list);
return get_sha1_oneline(name + 2, sha1, list);
}
if (namelen < 3 || if (namelen < 3 ||
name[2] != ':' || name[2] != ':' ||
name[1] < '0' || '3' < name[1]) name[1] < '0' || '3' < name[1])