all repos — cgit @ c330a2e5f86e1f77d3b724877935e11014cefa21

a hyperfast web frontend for git written in c 

ui-blog: fix oid handling

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

This fixes faulty commit 6e4b7b6776eb994e795fa38b2619db6c55e10ecc
(ui-blob: replace 'unsigned char sha1[20]' with 'struct object_id oid').
Christian Hesse mail@eworm.de
Tue, 11 Oct 2016 08:55:34 +0200
commit

c330a2e5f86e1f77d3b724877935e11014cefa21

parent

2d59e6a64e9869cc8420cb532af29a9eba867004

1 files changed, 5 insertions(+), 5 deletions(-)

jump to
M ui-blob.c → ui-blob.c 
@@ -13,7 +13,7 @@ #include "ui-shared.h"
 
 struct walk_tree_context {
 	const char *match_path;
-	struct object_id matched_oid;
+	struct object_id *matched_oid;
 	unsigned int found_path:1;
 	unsigned int file_only:1;
 };

@@ -28,7 +28,7 @@ return READ_TREE_RECURSIVE;
 	if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
 		|| strcmp(walk_tree_ctx->match_path + base->len, pathname))
 		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;
 	return 0;
 }

@@ -47,7 +47,7 @@ .items = &path_items
 	};
 	struct walk_tree_context walk_tree_ctx = {
 		.match_path = path,
-		.matched_oid = oid,
+		.matched_oid = &oid,
 		.found_path = 0,
 		.file_only = file_only
 	};

@@ -77,7 +77,7 @@ .items = &path_items
 	};
 	struct walk_tree_context walk_tree_ctx = {
 		.match_path = path,
-		.matched_oid = oid,
+		.matched_oid = &oid,
 		.found_path = 0,
 		.file_only = file_only
 	};

@@ -120,7 +120,7 @@ .items = &path_items
 	};
 	struct walk_tree_context walk_tree_ctx = {
 		.match_path = path,
-		.matched_oid = oid,
+		.matched_oid = &oid,
 		.found_path = 0,
 		.file_only = file_only
 	};