Merge branch 'stable'

Lars Hjemli committed 16 years ago

Commit 547a64f2 parents 0642435 c86e2064 files · +4 −4Browse files

Unified · Split

4 files

Makefile +1 −1
ui-blob.c +1 −1
ui-plain.c +1 −1
ui-tree.c +1 −1

@@ -1,4 +1,4 @@
1	CGIT_VERSION = v0.8.3	1	CGIT_VERSION = v0.8.3.1
2	CGIT_SCRIPT_NAME = cgit.cgi	2	CGIT_SCRIPT_NAME = cgit.cgi
3	CGIT_SCRIPT_PATH = /var/www/htdocs/cgit	3	CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4	CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)	4	CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)

ui-blob.c+1−1

@@ -50,7 +50,7 @@ void cgit_print_blob(const char hex, char path, const char *head) · 49 unmodified lines
50	commit = lookup_commit_reference(sha1);	50	commit = lookup_commit_reference(sha1);
51	match_path = path;	51	match_path = path;
52	matched_sha1 = sha1;	52	matched_sha1 = sha1;
53	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);	53	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
54	type = sha1_object_info(sha1,&size);	54	type = sha1_object_info(sha1,&size);
55	}	55	}
56		56

ui-plain.c+1−1

@@ -88,7 +88,7 @@ void cgit_print_plain(struct cgit_context *ctx) · 87 unmodified lines
88	return;	88	return;
89	}	89	}
90	match_path = ctx->qry.path;	90	match_path = ctx->qry.path;
91	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);	91	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
92	if (!match)	92	if (!match)
93	html_status(404, "Not found", 0);	93	html_status(404, "Not found", 0);
94	}	94	}

ui-tree.c+1−1

@@ -286,6 +286,6 @@ void cgit_print_tree(const char rev, char path) · 285 unmodified lines
286	}	286	}
287		287
288	match_path = path;	288	match_path = path;
289	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);	289	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
290	ls_tail();	290	ls_tail();
291	}	291	}