mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-fix get_sha1_oneline()

Browse Source 
What the function wants to return is not if we saw any return
from pop_most_recent_commit(), but if we found what was asked
for.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds
2007-03-12 11:30:38 -07:00
committed by Junio C Hamano
parent 34572ed2c8
commit 1358e7d670
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sha1_name.c
View File

@ -602,10 +602,10 @@ static int handle_one_ref(const char *path,
*/ */
#define ONELINE_SEEN (1u<<20) #define ONELINE_SEEN (1u<<20)
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 = NULL, *backup = NULL, *l; struct commit_list *list = NULL, *backup = NULL, *l;
struct commit *commit = NULL; int retval = -1;
if (prefix[0] == '!') { if (prefix[0] == '!') {
if (prefix[1] != '!') if (prefix[1] != '!')
@ -619,22 +619,22 @@ int get_sha1_oneline(const char *prefix, unsigned char *sha1)
commit_list_insert(l->item, &backup); commit_list_insert(l->item, &backup);
while (list) { while (list) {
char *p; char *p;
struct commit *commit;
commit = pop_most_recent_commit(&list, ONELINE_SEEN); commit = pop_most_recent_commit(&list, ONELINE_SEEN);
if (!commit)
break;
parse_object(commit->object.sha1); parse_object(commit->object.sha1);
if (!commit->buffer || !(p = strstr(commit->buffer, "\n\n"))) if (!commit->buffer || !(p = strstr(commit->buffer, "\n\n")))
continue; continue;
if (!prefixcmp(p + 2, prefix)) { if (!prefixcmp(p + 2, prefix)) {
hashcpy(sha1, commit->object.sha1); hashcpy(sha1, commit->object.sha1);
retval = 0;
break; break;
} }
} }
free_commit_list(list); free_commit_list(list);
for (l = backup; l; l = l->next) for (l = backup; l; l = l->next)
clear_commit_marks(l->item, ONELINE_SEEN); clear_commit_marks(l->item, ONELINE_SEEN);
return commit == NULL; return retval;
} }
/* /*