about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-06-17 14:58:45 +0200
committerLars Hjemli <hjemli@gmail.com>2007-06-17 14:58:45 +0200
commitcd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e (patch)
treec303d75883492c89ed3243eadb31bdf2f3b9e660
parentAdd cgit_commit_link() + support for id=sha1 to commit view (diff)
downloadcgit-pink-cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e.tar.gz
cgit-pink-cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e.zip
ui-log: honor id=sha1 on querystring
This teaches ui-log to prefer id=sha1 and fallback to h=rev if no id-
parameter is specified. With this change, summary, log, commit and tree
views now passes current branch using h parameter and current revision
using id parameter.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.c2
-rw-r--r--ui-log.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index f5135d9..b936a70 100644
--- a/cgit.c
+++ b/cgit.c
@@ -92,7 +92,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
 	switch(cgit_cmd) {
 	case CMD_LOG:
-		cgit_print_log(cgit_query_head, cgit_query_ofs,
+		cgit_print_log(cgit_query_sha1, cgit_query_ofs,
 			       cgit_max_commit_count, cgit_query_search,
 			       cgit_query_path, 1);
 		break;
diff --git a/ui-log.c b/ui-log.c
index 8d774b0..95cb453 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -59,6 +59,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
 	int argc = 2;
 	int i;
 
+	if (!tip)
+		argv[1] = cgit_query_head;
+
 	if (grep)
 		argv[argc++] = fmt("--grep=%s", grep);
 	if (path) {