git: update to v2.18.0

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 21ac8f4e68ea34b9ff0d95eb80612ed38404d21b..d7c7636913a063cfc45eadab85f282a2bf5b6cc3 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -239,7 +239,7 @@ static int load_mmfile(mmfile_t *file, const struct object_id *oid)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
-               file->ptr = read_sha1_file(oid->hash, &type,
+               file->ptr = read_object_file(oid, &type,
                                           (unsigned long *)&file->size);
        }
        return 1;
@@ -390,6 +390,9 @@ int cgit_parse_snapshots_mask(const char *str)
        if (atoi(str))
                return 1;
 
+       if (strcmp(str, "all") == 0)
+               return INT_MAX;
+
        string_list_split(&tokens, str, ' ', -1);
        string_list_remove_empty_items(&tokens, 0);
 
@@ -397,7 +400,7 @@ int cgit_parse_snapshots_mask(const char *str)
                for (f = cgit_snapshot_formats; f->suffix; f++) {
                        if (!strcmp(item->string, f->suffix) ||
                            !strcmp(item->string, f->suffix + 1)) {
-                               rv |= f->bit;
+                               rv |= cgit_snapshot_format_bit(f);
                                break;
                        }
                }