Merge commit 'jc/maint' into gfi-maint

[thirdparty/git.git] / sha1_name.c

diff --git a/sha1_name.c b/sha1_name.c
index a7efa96f35c3a9aadf222f934c37515f00e68676..bede0e5b0659db31a1dfdaab3d17627199150ea7 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -76,10 +76,10 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
 
        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 = num_packed_objects(p);
+               uint32_t first = 0, last = num;
                while (first < last) {
-                       unsigned mid = (first + last) / 2;
+                       uint32_t mid = (first + last) / 2;
                        unsigned char now[20];
                        int cmp;
 
@@ -577,6 +577,66 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
        return get_short_sha1(name, len, sha1, 0);
 }
 
+static int handle_one_ref(const char *path,
+               const unsigned char *sha1, int flag, void *cb_data)
+{
+       struct commit_list **list = cb_data;
+       struct object *object = parse_object(sha1);
+       if (!object)
+               return 0;
+       if (object->type == OBJ_TAG)
+               object = deref_tag(object, path, strlen(path));
+       if (object->type != OBJ_COMMIT)
+               return 0;
+       insert_by_date((struct commit *)object, list);
+       return 0;
+}
+
+/*
+ * This interprets names like ':/Initial revision of "git"' by searching
+ * through history and returning the first commit whose message starts
+ * with the given string.
+ *
+ * For future extension, ':/!' is reserved. If you want to match a message
+ * beginning with a '!', you have to repeat the exclamation mark.
+ */
+
+#define ONELINE_SEEN (1u<<20)
+static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
+{
+       struct commit_list *list = NULL, *backup = NULL, *l;
+       int retval = -1;
+
+       if (prefix[0] == '!') {
+               if (prefix[1] != '!')
+                       die ("Invalid search pattern: %s", prefix);
+               prefix++;
+       }
+       if (!save_commit_buffer)
+               return error("Could not expand oneline-name.");
+       for_each_ref(handle_one_ref, &list);
+       for (l = list; l; l = l->next)
+               commit_list_insert(l->item, &backup);
+       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 retval;
+}
+
 /*
  * This is like "get_sha1_basic()", except it allows "sha1 expressions",
  * notably "xyz^" for "parent of xyz"
@@ -600,6 +660,8 @@ int get_sha1(const char *name, unsigned char *sha1)
                int stage = 0;
                struct cache_entry *ce;
                int pos;
+               if (namelen > 2 && name[1] == '/')
+                       return get_sha1_oneline(name + 2, sha1);
                if (namelen < 3 ||
                    name[2] != ':' ||
                    name[1] < '0' || '3' < name[1])