mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-blog: fix oid handling

Browse Source 
We have to use a pointer for walk_tree_ctx->matched_oid.

This fixes faulty commit 6e4b7b6776
(ui-blob: replace 'unsigned char sha1[20]' with 'struct object_id oid').
This commit is contained in:
Christian Hesse 2016-10-11 08:55:34 +02:00 committed by Jason A. Donenfeld
parent 2d59e6a64e
commit c330a2e5f8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui-blob.c
View File

@ -13,7 +13,7 @@
struct walk_tree_context { struct walk_tree_context {
const char *match_path; const char *match_path;
struct object_id matched_oid; struct object_id *matched_oid;
unsigned int found_path:1; unsigned int found_path:1;
unsigned int file_only:1; unsigned int file_only:1;
}; };
@ -28,7 +28,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
if (strncmp(base->buf, walk_tree_ctx->match_path, base->len) if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
|| strcmp(walk_tree_ctx->match_path + base->len, pathname)) || strcmp(walk_tree_ctx->match_path + base->len, pathname))
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;
hashcpy(walk_tree_ctx->matched_oid.hash, sha1); hashcpy(walk_tree_ctx->matched_oid->hash, sha1);
walk_tree_ctx->found_path = 1; walk_tree_ctx->found_path = 1;
return 0; return 0;
} }
@ -47,7 +47,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
}; };
struct walk_tree_context walk_tree_ctx = { struct walk_tree_context walk_tree_ctx = {
.match_path = path, .match_path = path,
.matched_oid = oid, .matched_oid = &oid,
.found_path = 0, .found_path = 0,
.file_only = file_only .file_only = file_only
}; };
@ -77,7 +77,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
}; };
struct walk_tree_context walk_tree_ctx = { struct walk_tree_context walk_tree_ctx = {
.match_path = path, .match_path = path,
.matched_oid = oid, .matched_oid = &oid,
.found_path = 0, .found_path = 0,
.file_only = file_only .file_only = file_only
}; };
@ -120,7 +120,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
}; };
struct walk_tree_context walk_tree_ctx = { struct walk_tree_context walk_tree_ctx = {
.match_path = path, .match_path = path,
.matched_oid = oid, .matched_oid = &oid,
.found_path = 0, .found_path = 0,
.file_only = file_only .file_only = file_only
}; };