Re-fix get_sha1_oneline()

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>

diff --git a/sha1_name.c b/sha1_name.c
index 6b8b67b4db3cbccc13d6ddda5dd3a1be11adabd1..bede0e5b0659db31a1dfdaab3d17627199150ea7 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -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[1] != '!')
 
        if (prefix[0] == '!') {
                if (prefix[1] != '!')


@@ -619,22 +619,22 @@ int get_sha1_oneline(const char *prefix, unsigned char *sha1)
                commit_list_insert(l->item, &backup);
        while (list) {
                char *p;
                commit_list_insert(l->item, &backup);
        while (list) {
                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);
                if (!commit->buffer || !(p = strstr(commit->buffer, "\n\n")))
                        continue;
                if (!prefixcmp(p + 2, prefix)) {
                        hashcpy(sha1, commit->object.sha1);
                parse_object(commit->object.sha1);
                if (!commit->buffer || !(p = strstr(commit->buffer, "\n\n")))
                        continue;
                if (!prefixcmp(p + 2, prefix)) {
                        hashcpy(sha1, commit->object.sha1);

+                       retval = 0;

                        break;
                }
        }
        free_commit_list(list);
        for (l = backup; l; l = l->next)
                clear_commit_marks(l->item, ONELINE_SEEN);
                        break;
                }
        }
        free_commit_list(list);
        for (l = backup; l; l = l->next)
                clear_commit_marks(l->item, ONELINE_SEEN);

-       return commit == NULL;
+       return retval;

 }
 
 /*
 }
 
 /*