Use .git/MERGE_MSG in cherry-pick/revert

[git.git] / sha1_name.c

diff --git a/sha1_name.c b/sha1_name.c
index 0781477a71ac4d76a1b8783868d6649cae7f8507..55f25a2d3b49b1d565a9840b7dcfb2e22687cdd3 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -71,19 +71,19 @@ static int match_sha(unsigned len, const unsigned char *a, const unsigned char *
 static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1)
 {
        struct packed_git *p;
-       unsigned char found_sha1[20];
+       const unsigned char *found_sha1 = NULL;
        int found = 0;
 
        prepare_packed_git();
        for (p = packed_git; p && found < 2; p = p->next) {
-               unsigned num = num_packed_objects(p);
-               unsigned first = 0, last = num;
+               uint32_t num = p->num_objects;
+               uint32_t first = 0, last = num;
                while (first < last) {
-                       unsigned mid = (first + last) / 2;
-                       unsigned char now[20];
+                       uint32_t mid = (first + last) / 2;
+                       const unsigned char *now;
                        int cmp;
 
-                       nth_packed_object_sha1(p, mid, now);
+                       now = nth_packed_object_sha1(p, mid);
                        cmp = hashcmp(match, now);
                        if (!cmp) {
                                first = mid;
@@ -96,14 +96,14 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
                        last = mid;
                }
                if (first < num) {
-                       unsigned char now[20], next[20];
-                       nth_packed_object_sha1(p, first, now);
+                       const unsigned char *now, *next;
+                      now = nth_packed_object_sha1(p, first);
                        if (match_sha(len, match, now)) {
-                               if (nth_packed_object_sha1(p, first+1, next) ||
-                                   !match_sha(len, match, next)) {
+                               next = nth_packed_object_sha1(p, first+1);
+                              if (!next|| !match_sha(len, match, next)) {
                                        /* unique within this pack */
                                        if (!found) {
-                                               hashcpy(found_sha1, now);
+                                               found_sha1 = now;
                                                found++;
                                        }
                                        else if (hashcmp(found_sha1, now)) {
@@ -602,10 +602,10 @@ static int handle_one_ref(const char *path,
  */
 
 #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 *commit;
+       int retval = -1;
 
        if (prefix[0] == '!') {
                if (prefix[1] != '!')
@@ -617,20 +617,24 @@ int get_sha1_oneline(const char *prefix, unsigned char *sha1)
        for_each_ref(handle_one_ref, &list);
        for (l = list; l; l = l->next)
                commit_list_insert(l->item, &backup);
-       while ((commit = pop_most_recent_commit(&list, ONELINE_SEEN))) {
+       while (list) {
                char *p;
+               struct commit *commit;
+
+               commit = pop_most_recent_commit(&list, ONELINE_SEEN);
                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);
-       return commit == NULL;
+       return retval;
 }
 
 /*
@@ -639,11 +643,17 @@ int get_sha1_oneline(const char *prefix, unsigned char *sha1)
  */
 int get_sha1(const char *name, unsigned char *sha1)
 {
-       int ret, bracket_depth;
        unsigned unused;
+       return get_sha1_with_mode(name, sha1, &unused);
+}
+
+int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
+{
+       int ret, bracket_depth;
        int namelen = strlen(name);
        const char *cp;
 
+       *mode = S_IFINVALID;
        prepare_alt_odb();
        ret = get_sha1_1(name, namelen, sha1);
        if (!ret)
@@ -681,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);
+                               *mode = ntohl(ce->ce_mode);
                                return 0;
                        }
                        pos++;
@@ -699,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
                unsigned char tree_sha1[20];
                if (!get_sha1_1(name, cp-name, tree_sha1))
                        return get_tree_entry(tree_sha1, cp+1, sha1,
-                                             &unused);
+                                             mode);
        }
        return ret;
 }