X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/efea54ac4d226e0216b040881734821a0901faf7d8034bf64e5daa32d140ccb5..be731a362b6c8212efe520e1166c163e04ef7dbeb7c3c31feb971ad4847d29b0:/gitweb.cgi

diff --git a/gitweb.cgi b/gitweb.cgi
index 69326f6..8ec96cd 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -10,11 +10,12 @@
 use strict;
 use warnings;
 use CGI qw(:standard :escapeHTML);
+use CGI::Util qw(unescape);
 use CGI::Carp qw(fatalsToBrowser);
 use Fcntl ':mode';
 
 my $cgi = new CGI;
-my $version =		"118";
+my $version =		"152";
 my $my_url =		$cgi->url();
 my $my_uri =		$cgi->url(-absolute => 1);
 my $rss_link = "";
@@ -29,11 +30,14 @@ my $gitbin =		"/usr/bin";
 my $gittmp =		"/tmp/gitweb";
 
 # target of the home link on top of all pages
-my $home_link =		"/git";
+my $home_link =		$my_uri;
+
+# html text to include at home page
+my $home_text =		"indextext.html";
 
 # source of projects list
 #my $projects_list = $projectroot;
-my $projects_list = "index/index.txt";
+my $projects_list = "index/index.aux";
 
 # input validation and dispatch
 my $action = $cgi->param('a');
@@ -47,7 +51,7 @@ if (defined $action) {
 		exit;
 	}
 } else {
-	$action = "log";
+	$action = "summary";
 }
 
 my $project = $cgi->param('p');
@@ -69,9 +73,10 @@ if (defined $project) {
 		die_error(undef, "No such project.");
 	}
 	$rss_link = "<link rel=\"alternate\" title=\"$project log\" href=\"$my_uri?p=$project;a=rss\" type=\"application/rss+xml\"/>";
+	$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$project/objects";
 	$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
 } else {
-	git_project_list($projects_list);
+	git_project_list();
 	exit;
 }
 
@@ -113,7 +118,16 @@ if (defined $time_back) {
 	}
 }
 
-if ($action eq "blob") {
+if ($action eq "summary") {
+	git_summary();
+	exit;
+} elsif ($action eq "branches") {
+	git_branches();
+	exit;
+} elsif ($action eq "tags") {
+	git_tags();
+	exit;
+} elsif ($action eq "blob") {
 	git_blob();
 	exit;
 } elsif ($action eq "tree") {
@@ -163,49 +177,48 @@ sub git_header_html {
 <title>$title</title>
 $rss_link
 <style type="text/css">
-body { font-family: sans-serif; font-size: 12px; margin:0px; }
+body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
 a { color:#0000cc; }
-a:hover { color:#880000; }
-a:visited { color:#880000; }
-a:active { color:#880000; }
-div.page_header {
-	margin:15px 15px 0px; height:25px; padding:8px;
-	font-size:18px; font-weight:bold; background-color:#d9d8d1;
-}
+a:hover, a:visited, a:active { color:#880000; }
+div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
 div.page_header a:visited { color:#0000cc; }
 div.page_header a:hover { color:#880000; }
-div.page_nav { margin:0px 15px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
+div.page_nav { padding:8px; }
 div.page_nav a:visited { color:#0000cc; }
-div.page_path { font-weight:bold; margin:0px 15px; padding:8px; border:solid #d9d8d1; border-width:0px 1px 1px}
-div.page_footer { margin:0px 15px 15px; height:17px; padding:4px; padding-left:8px; background-color: #d9d8d1; }
+div.page_path { font-weight:bold; padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
+div.page_footer { height:17px; padding:4px 8px; background-color: #d9d8d1; }
 div.page_footer_text { float:left; color:#555555; font-style:italic; }
-div.page_body { margin:0px 15px; padding:8px; border:solid #d9d8d1; border-width:0px 1px; }
+div.page_body { padding:8px; }
 div.title, a.title {
-	display:block; margin:0px 15px; padding:6px 8px;
+	display:block; padding:6px 8px;
 	font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
 }
 a.title:hover { background-color: #d9d8d1; }
-div.title_text { margin:0px 15px; padding:6px 8px; border: solid #d9d8d1; border-width:0px 1px 1px; }
-div.log_body { margin:0px 15px; padding:8px; padding-left:150px; border:solid #d9d8d1; border-width:0px 1px; }
-span.log_age { position:relative; float:left; width:142px; font-style:italic; }
-div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; }
-div.list {
-	display:block; margin:0px 15px; padding:4px 6px 2px; border:solid #d9d8d1; border-width:0px 1px;
-	font-weight:bold;
+div.title_text { padding:6px 8px; border: solid #d9d8d1; border-width:0px 0px 1px; }
+div.log_body { padding:8px 8px 8px 150px; }
+span.age { position:relative; float:left; width:142px; font-style:italic; }
+div.log_link {
+	font-size:10px; font-family:sans-serif; font-style:normal;
+	position:relative; float:left; width:142px;
 }
+div.list { display:block; padding:4px 8px 2px; }
 div.list_head {
-	display:block; margin:0px 15px; padding:6px 6px 4px; border:solid #d9d8d1; border-width:0px 1px 1px;
-	font-style:italic;
+	display:block; padding:6px 6px 4px; border:solid #d9d8d1;
+	border-width:0px 0px 1px; font-style:italic;
 }
 div.list a { text-decoration:none; color:#000000; }
 div.list a:hover { color:#880000; }
-div.link {
-	margin:0px 15px; padding:0px 6px 8px; border:solid #d9d8d1; border-width:0px 1px 1px;
+div.list_link {
+	padding:4px 8px 6px; border:solid #d9d8d1; border-width:0px 0px 1px;
 	font-family:sans-serif; font-size:10px;
 }
 td { padding:5px 15px 0px 0px; font-size:12px; }
 th { padding-right:10px; font-size:12px; text-align:left; }
-span.diff_info { color:#000099; background-color:#edece6; font-style:italic; }
+td.link { font-family:sans-serif; font-size:10px; }
+td.pre { font-family:monospace; font-size:12px; white-space:pre; padding:2px 15px 0px 0px; }
+div.pre { font-family:monospace; font-size:12px; white-space:pre; }
+div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
+div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
 a.rss_logo { float:right; padding:3px 0px; width:35px; line-height:10px;
 	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
 	color:#ffffff; background-color:#ff6600;
@@ -218,11 +231,11 @@ a.rss_logo:hover { background-color:#ee5500; }
 <body>
 EOF
 	print "<div class=\"page_header\">\n" .
-	      "<a href=\"http://kernel.org/pub/software/scm/cogito\">" .
+	      "<a href=\"http://kernel.org/pub/software/scm/git/docs/\">" .
 	      "<img src=\"$my_uri?a=git-logo.png\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/></a>";
 	print $cgi->a({-href => $home_link}, "projects") . " / ";
 	if (defined $project) {
-		print $cgi->a({-href => "$my_uri?p=$project;a=log"}, escapeHTML($project));
+		print $cgi->a({-href => "$my_uri?p=$project;a=summary"}, escapeHTML($project));
 		if (defined $action) {
 			print " / $action";
 		}
@@ -257,17 +270,25 @@ sub die_error {
 	exit;
 }
 
-sub git_read_head {
+sub git_get_type {
+	my $hash = shift;
+
+	open my $fd, "-|", "$gitbin/git-cat-file -t $hash" || return;
+	my $type = <$fd>;
+	close $fd;
+	chomp $type;
+	return $type;
+}
+
+sub git_read_hash {
 	my $path = shift;
 
-	open my $fd, "$projectroot/$path/HEAD" || return undef;
+	open my $fd, "$projectroot/$path" || return undef;
 	my $head = <$fd>;
 	close $fd;
 	chomp $head;
 	if ($head =~ m/^[0-9a-fA-F]{40}$/) {
 		return $head;
-	} else {
-		return undef;
 	}
 }
 
@@ -281,6 +302,28 @@ sub git_read_description {
 	return $descr;
 }
 
+sub git_read_tag {
+	my $tag_id = shift;
+	my %tag;
+
+	open my $fd, "-|", "$gitbin/git-cat-file tag $tag_id" || return;
+	while (my $line = <$fd>) {
+		chomp $line;
+		if ($line =~ m/^object ([0-9a-fA-F]{40})$/) {
+			$tag{'object'} = $1;
+		} elsif ($line =~ m/^type (.*)$/) {
+			$tag{'type'} = $1;
+		} elsif ($line =~ m/^tag (.*)$/) {
+			$tag{'name'} = $1;
+		}
+	}
+	close $fd || return;
+	if (!defined $tag{'name'}) {
+		return
+	};
+	return %tag
+}
+
 sub git_read_commit {
 	my $commit = shift;
 	my %co;
@@ -308,23 +351,28 @@ sub git_read_commit {
 			$co{'committer_name'} =~ s/ <.*//;
 		}
 	}
+	if (!defined $co{'tree'}) {
+		close $fd;
+		return undef
+	};
 	$co{'parents'} = \@parents;
 	$co{'parent'} = $parents[0];
 	my (@comment) = map { chomp; $_ } <$fd>;
 	$co{'comment'} = \@comment;
-	$co{'title'} = $comment[0];
+	$comment[0] =~ m/^(.{0,60}[^ ]*)/;
+	$co{'title'} = $1;
+	if ($comment[0] ne $co{'title'}) {
+		$co{'title'} .= " ...";
+	}
 	close $fd || return;
-	if (!defined $co{'tree'}) {
-		return undef
-	};
 
 	my $age = time - $co{'committer_epoch'};
 	$co{'age'} = $age;
 	if ($age > 60*60*24*365*2) {
 		$co{'age_string'} = (int $age/60/60/24/365);
 		$co{'age_string'} .= " years ago";
-	} elsif ($age > 60*60*24*365/12*2) {
-		$co{'age_string'} = int $age/60/60/24/365/12;
+	} elsif ($age > 60*60*24*(365/12)*2) {
+		$co{'age_string'} = int $age/60/60/24/(365/12);
 		$co{'age_string'} .= " months ago";
 	} elsif ($age > 60*60*24*7*2) {
 		$co{'age_string'} = int $age/60/60/24/7;
@@ -337,10 +385,10 @@ sub git_read_commit {
 		$co{'age_string'} .= " hours ago";
 	} elsif ($age > 60*2) {
 		$co{'age_string'} = int $age/60;
-		$co{'age_string'} .= " minutes ago";
+		$co{'age_string'} .= " min ago";
 	} elsif ($age > 2) {
 		$co{'age_string'} = int $age;
-		$co{'age_string'} .= " seconds ago";
+		$co{'age_string'} .= " sec ago";
 	} else {
 		$co{'age_string'} .= " right now";
 	}
@@ -381,15 +429,20 @@ sub git_diff_html {
 
 	open my $fd, "-|", "/usr/bin/diff -u -p -L $from_name -L $to_name $from_tmp $to_tmp";
 	while (my $line = <$fd>) {
-		my $char = substr($line,0,1);
-		# skip errors
-		next if $char eq '\\';
-		# color the diff
-		print '<span style="color: #008800;">' if $char eq '+';
-		print '<span style="color: #CC0000;">' if $char eq '-';
-		print '<span style="color: #990099;">' if $char eq '@';
-		print escapeHTML($line);
-		print '</span>' if $char eq '+' or $char eq '-' or $char eq '@';
+		chomp($line);
+		my $char = substr($line, 0, 1);
+		my $color = "";
+		if ($char eq '+') {
+			$color = " style=\"color:#008800;\"";
+		} elsif ($char eq '-') {
+			$color = " style=\"color:#cc0000;\"";
+		} elsif ($char eq '@') {
+			$color = " style=\"color:#990099;\"";
+		} elsif ($char eq '\\') {
+			# skip errors
+			next;
+		}
+		print "<div class=\"pre\"$color>" . escapeHTML($line) . "</div>\n";
 	}
 	close $fd;
 
@@ -460,7 +513,7 @@ sub date_str {
 }
 
 # git-logo (cached in browser for one day)
-sub git_logo() {
+sub git_logo {
 	print $cgi->header(-type => 'image/png', -expires => '+1d');
 	# cat git-logo.png | hexdump -e '16/1 " %02x"  "\n"' | sed 's/ /\\x/g'
 	print	"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52" .
@@ -478,27 +531,54 @@ sub git_logo() {
 		"\x12\x1c\x9a\xfe\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82";
 }
 
+sub get_file_owner {
+	my $path = shift;
+
+	my ($dev, $ino, $mode, $nlink, $st_uid, $st_gid, $rdev, $size) = stat($path);
+	my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell) = getpwuid($st_uid);
+	if (!defined $gcos) {
+		return undef;
+	}
+	my $owner = $gcos;
+	$owner =~ s/[,;].*$//;
+	return $owner;
+}
+
 sub git_project_list {
-	my $project_list = shift;
 	my @list;
 
-	if (-d $project_list) {
+	if (-d $projects_list) {
 		# search in directory
-		my $dir = $project_list;
+		my $dir = $projects_list;
 		opendir my $dh, $dir || return undef;
 		while (my $dir = readdir($dh)) {
 			if (-e "$projectroot/$dir/HEAD") {
-				push @list, $dir;
+				my $pr = {
+					path => $dir,
+				};
+				push @list, $pr
 			}
 		}
 		closedir($dh);
-	} elsif (-e $project_list) {
-		# read from file
-		open my $fd , $project_list || return undef;
+	} elsif (-f $projects_list) {
+		# read from file:
+		# 'git/git.git:Linus Torvalds'
+		# 'linux/hotplug/udev.git'
+		open my $fd , $projects_list || return undef;
 		while (my $line = <$fd>) {
 			chomp $line;
-			if (-e "$projectroot/$line/HEAD") {
-				push @list, $line;
+			my ($path, $owner) = split ' ', $line;
+			$path = unescape($path);
+			$owner = unescape($owner);
+			if (!defined $path) {
+				next;
+			}
+			if (-e "$projectroot/$path/HEAD") {
+				my $pr = {
+					path => $path,
+					owner => $owner,
+				};
+				push @list, $pr
 			}
 		}
 		close $fd;
@@ -507,48 +587,61 @@ sub git_project_list {
 	if (!@list) {
 		die_error(undef, "No project found.");
 	}
-	@list = sort @list;
+	@list = sort {$a->{'path'} cmp $b->{'path'}} @list;
 
 	git_header_html();
-	print "<div class=\"page_body\">\n";
-	print "<table cellspacing=\"0\">\n";
-	print "<tr>\n" .
+	if (-f $home_text) {
+		print "<div class=\"index_include\">\n";
+		open (my $fd, $home_text);
+		print <$fd>;
+		close $fd;
+		print "</div>\n";
+	}
+	print "<div class=\"page_body\"><br/>\n" .
+	      "<table cellspacing=\"0\">\n" .
+	      "<tr>\n" .
 	      "<th>Project</th>\n" .
 	      "<th>Description</th>\n" .
 	      "<th>Owner</th>\n" .
 	      "<th>last change</th>\n" .
-	      "</tr>\n" .
-	      "<br/>";
-	foreach my $proj (@list) {
-		my $head = git_read_head($proj);
+	      "<th></th>\n" .
+	      "</tr>\n";
+	foreach my $pr (@list) {
+		my %proj = %$pr;
+		my $head = git_read_hash("$proj{'path'}/HEAD");
 		if (!defined $head) {
 			next;
 		}
-		$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$proj/objects";
+		$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$proj{'path'}/objects";
+		$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$proj{'path'}/objects";
 		my %co = git_read_commit($head);
 		if (!%co) {
 			next;
 		}
-		my $descr = git_read_description($proj) || "";
-		my $owner = "";
-		my ($dev, $ino, $mode, $nlink, $st_uid, $st_gid, $rdev, $size) = stat("$projectroot/$proj");
-		my ($name, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell) = getpwuid($st_uid);
-		if (defined $gcos) {
-			$owner = $gcos;
-			$owner =~ s/[,;].*$//;
+		my $descr = git_read_description($proj{'path'}) || "";
+		# get directory owner if not already specified
+		if (!defined $proj{'owner'}) {
+			$proj{'owner'} = get_file_owner("$projectroot/$proj{'path'}") || "";
 		}
 		print "<tr>\n" .
-		      "<td>" . $cgi->a({-href => "$my_uri?p=$proj;a=log"}, escapeHTML($proj)) . "</td>\n" .
+		      "<td>" . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, escapeHTML($proj{'path'})) . "</td>\n" .
 		      "<td>$descr</td>\n" .
-		      "<td><i>$owner</i></td>\n";
+		      "<td><i>$proj{'owner'}</i></td>\n";
+		my $colored_age;
 		if ($co{'age'} < 60*60*2) {
-			print "<td><span style =\"color: #009900;\"><b><i>" . $co{'age_string'} . "</i></b></span></td>\n";
+			$colored_age = "<span style =\"color: #009900;\"><b><i>$co{'age_string'}</i></b></span>";
 		} elsif ($co{'age'} < 60*60*24*2) {
-			print "<td><span style =\"color: #009900;\"><i>" . $co{'age_string'} . "</i></span></td>\n";
+			$colored_age = "<span style =\"color: #009900;\"><i>$co{'age_string'}</i></span>";
 		} else {
-			print "<td><i>" . $co{'age_string'} . "</i></td>\n";
+			$colored_age = "<i>$co{'age_string'}</i>";
 		}
-		print "</tr>\n";
+		print "<td>$colored_age</td>\n" .
+		      "<td class=\"link\">" .
+		      $cgi->a({-href => "$my_uri?p=$proj{'path'};a=summary"}, "summary") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=log"}, "log") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$proj{'path'};a=tree"}, "tree") .
+		      "</td>\n" .
+		      "</tr>\n";
 	}
 	print "</table>\n" .
 	      "<br/>\n" .
@@ -556,6 +649,215 @@ sub git_project_list {
 	git_footer_html();
 }
 
+sub git_read_refs {
+	my $ref_dir = shift;
+	my @reflist;
+
+	opendir my $dh, "$projectroot/$project/$ref_dir";
+	my @refs = grep !m/^\./, readdir $dh;
+	closedir($dh);
+	foreach my $ref_file (@refs) {
+		my $ref_id = git_read_hash("$project/$ref_dir/$ref_file");
+		my $type = git_get_type($ref_id) || next;
+		my %ref_item;
+		my %co;
+		if ($type eq "tag") {
+			my %tag = git_read_tag($ref_id);
+			if ($tag{'type'} eq "commit") {
+				%co = git_read_commit($tag{'object'});
+			}
+			$ref_item{'type'} = $tag{'type'};
+			$ref_item{'name'} = $tag{'name'};
+			$ref_item{'id'} = $tag{'object'};
+		} elsif ($type eq "commit"){
+			%co = git_read_commit($ref_id);
+			$ref_item{'type'} = "commit";
+			$ref_item{'name'} = $ref_file;
+			$ref_item{'title'} = $co{'title'};
+			$ref_item{'id'} = $ref_id;
+		}
+		$ref_item{'epoch'} = $co{'committer_epoch'} || 0;
+		$ref_item{'age'} = $co{'age_string'} || "unknown";
+
+		push @reflist, \%ref_item;
+	}
+	# sort tags by age
+	@reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
+	return \@reflist;
+}
+
+sub git_summary {
+	my $descr = git_read_description($project) || "none";
+	my $head = git_read_hash("$project/HEAD");
+	$ENV{'GIT_OBJECT_DIRECTORY'} = "$projectroot/$project/objects";
+	$ENV{'SHA1_FILE_DIRECTORY'} = "$projectroot/$project/objects";
+	my %co = git_read_commit($head);
+	my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
+
+	my $owner;
+	if (-f $projects_list) {
+		open (my $fd , $projects_list);
+		while (my $line = <$fd>) {
+			chomp $line;
+			my ($pr, $ow) = split ' ', $line;
+			$pr = unescape($pr);
+			$ow = unescape($ow);
+			if ($pr eq $project) {
+				$owner = $ow;
+				last;
+			}
+		}
+		close $fd;
+	}
+	if (!defined $owner) {
+		$owner = get_file_owner("$projectroot/$project");
+	}
+
+	git_header_html();
+	print "<div class=\"page_nav\">\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+	      "<br/><br/>\n" .
+	      "</div>\n";
+	print "<div class=\"title\">project</div>\n";
+	print "<div class=\"page_body\">\n" .
+	      "<table cellspacing=\"0\">\n" .
+	      "<tr><td>description</td><td>" . escapeHTML($descr) . "</td></tr>\n" .
+	      "<tr><td>owner</td><td>$owner</td></tr>\n" .
+	      "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
+	      "</table>\n" .
+	      "<br/></div>\n";
+	open my $fd, "-|", "$gitbin/git-rev-list --max-count=11 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed.");
+	my (@revlist) = map { chomp; $_ } <$fd>;
+	close $fd;
+	print "<div>\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log", -class => "title"}, "commits") .
+	      "</div>\n";
+	my $i = 10;
+	print  "<div class=\"page_body\">\n" .
+	       "<table cellspacing=\"0\">\n";
+	foreach my $commit (@revlist) {
+		my %co = git_read_commit($commit);
+		my %ad = date_str($co{'author_epoch'});
+		print "<tr>\n";
+		if (--$i > 0) {
+			print "<td>$co{'age_string'}</td>\n" .
+			      "<td>$co{'author_name'}</td>\n" .
+			      "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, escapeHTML($co{'title'})) . "</td>\n" .
+			      "</tr>";
+		} else {
+			print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=log"}, "...") . "</td>\n" .
+			"</tr>";
+			last;
+		}
+	}
+	print "</table\n>" .
+	      "</div>\n";
+
+	my $taglist = git_read_refs("refs/tags");
+	if (defined @$taglist) {
+		print "<div>\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=tags", -class => "title"}, "tags") .
+		      "</div>\n";
+		my $i = 10;
+		print  "<div class=\"page_body\">\n" .
+		       "<table cellspacing=\"0\">\n";
+		foreach my $entry (@$taglist) {
+			my %tag = %$entry;
+			print "<tr>\n";
+			if (--$i > 0) {
+				print "<td>$tag{'age'}</td>\n" .
+				      "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "</td>\n" .
+				      "</tr>";
+			} else {
+				print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=tags"}, "...") . "</td>\n" .
+				"</tr>";
+				last;
+			}
+		}
+		print "</table\n>" .
+		      "</div>\n";
+	}
+
+	my $branchlist = git_read_refs("refs/heads");
+	if (defined @$branchlist) {
+		print "<div>\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=branches", -class => "title"}, "branches") .
+		      "</div>\n";
+		my $i = 10;
+		print  "<div class=\"page_body\">\n" .
+		       "<table cellspacing=\"0\">\n";
+		foreach my $entry (@$branchlist) {
+			my %tag = %$entry;
+			print "<tr>\n";
+			if (--$i > 0) {
+				print "<td>$tag{'age'}</td>\n" .
+				      "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"}, escapeHTML($tag{'name'})) . "</td>\n" .
+				      "</tr>";
+			} else {
+				print "<td>" . $cgi->a({-href => "$my_uri?p=$project;a=branches"}, "...") . "</td>\n" .
+				"</tr>";
+				last;
+			}
+		}
+		print "</table\n>" .
+		      "</div>\n";
+	}
+	git_footer_html();
+}
+
+sub git_tags {
+	my $head = git_read_hash("$project/HEAD");
+	git_header_html();
+	print "<div class=\"page_nav\">\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+	      "<br/><br/>\n" .
+	      "</div>\n";
+	my $taglist = git_read_refs("refs/tags");
+	print "<div>\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "tags") .
+	      "</div>\n";
+	if (defined @$taglist) {
+		foreach my $entry (@$taglist) {
+			my %tag = %$entry;
+			print "<div class=\"list\">\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=$tag{'type'};h=$tag{'id'}"},
+			      "<span class=\"age\">$tag{'age'}</span>" .  escapeHTML($tag{'name'})) . "\n" .
+			      "</div>\n";
+		}
+	}
+	print "<div class=\"list\"><br/></div>\n";
+	git_footer_html();
+}
+
+sub git_branches {
+	my $head = git_read_hash("$project/HEAD");
+	git_header_html();
+	print "<div class=\"page_nav\">\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$head"}, "commit") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree"}, "tree") .
+	      "<br/><br/>\n" .
+	      "</div>\n";
+	my $taglist = git_read_refs("refs/heads");
+	print "<div>\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=summary", -class => "title"}, "branches") .
+	      "</div>\n";
+	if (defined @$taglist) {
+		foreach my $entry (@$taglist) {
+			my %tag = %$entry;
+			print "<div class=\"list\">\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=log;h=$tag{'id'}"},
+			      "<span class=\"age\">$tag{'age'}</span>" .  escapeHTML($tag{'name'})) . "\n" .
+			      "</div>\n";
+		}
+	}
+	print "<div class=\"list\"><br/></div>\n";
+	git_footer_html();
+}
+
 sub git_get_hash_by_path {
 	my $base = shift;
 	my $path = shift;
@@ -565,7 +867,7 @@ sub git_get_hash_by_path {
 	while (my $part = shift @parts) {
 		open my $fd, "-|", "$gitbin/git-ls-tree $tree" || die_error(undef, "Open git-ls-tree failed.");
 		my (@entries) = map { chomp; $_ } <$fd>;
-		close $fd || die_error(undef, "Reading tree failed.");
+		close $fd || return undef;
 		foreach my $line (@entries) {
 			#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 			$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
@@ -588,24 +890,25 @@ sub git_get_hash_by_path {
 
 sub git_blob {
 	if (!defined $hash && defined $file_name) {
-		my $base = $hash_base || git_read_head($project);
+		my $base = $hash_base || git_read_hash("$project/HEAD");
 		$hash = git_get_hash_by_path($base, $file_name, "blob");
 	}
 	open my $fd, "-|", "$gitbin/git-cat-file blob $hash" || die_error(undef, "Open failed.");
 	my $base = $file_name || "";
 	git_header_html();
 	if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
-		print "<div class=\"page_nav\"> view\n" .
+		print "<div class=\"page_nav\">\n" .
 		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
-		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "diffs") .
-		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree");
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree");
 		if (defined $file_name) {
 			print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history");
 		}
 		print "<br/><br/>\n" .
 		      "</div>\n";
-		print "<div>\n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) . "\n";
+		print "<div>" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base", -class => "title"}, escapeHTML($co{'title'})) .
+		      "</div>\n";
 	} else {
 		print "<div class=\"page_nav\">\n" .
 		      "<br/><br/></div>\n" .
@@ -614,26 +917,31 @@ sub git_blob {
 	if (defined $file_name) {
 		print "<div class=\"page_path\">/$file_name</div>\n";
 	}
-	print "<div class=\"page_body\"><pre>\n" .
+	print "<div class=\"page_body\">\n";
 	my $nr;
 	while (my $line = <$fd>) {
+		chomp $line;
 		$nr++;
-		printf "<span style =\"color: #999999;\">%4i\t</span>%s", $nr, escapeHTML($line);;
+		print "<div class=\"pre\">";
+		printf "<span style=\"color:#999999;\">%4i</span>", $nr;
+		print " " .escapeHTML($line) . "</div>\n";
 	}
 	close $fd || print "Reading blob failed.\n";
-	print "</pre>\n";
 	print "</div>";
 	git_footer_html();
 }
 
 sub git_tree {
 	if (!defined $hash) {
-		$hash = git_read_head($project);
+		$hash = git_read_hash("$project/HEAD");
 		if (defined $file_name) {
-			my $base = $hash_base || git_read_head($project);
+			my $base = $hash_base || git_read_hash("$project/HEAD");
 			$hash = git_get_hash_by_path($base, $file_name, "tree");
 		}
 	}
+	if (!defined $hash_base) {
+		$hash_base = git_read_hash("$project/HEAD");
+	}
 	open my $fd, "-|", "$gitbin/git-ls-tree $hash" || die_error(undef, "Open git-ls-tree failed.");
 	my (@entries) = map { chomp; $_ } <$fd>;
 	close $fd || die_error(undef, "Reading tree failed.");
@@ -644,10 +952,11 @@ sub git_tree {
 	my $base = "";
 	if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
 		$base_key = ";hb=$hash_base";
-		print "<div class=\"page_nav\"> view\n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") . " | " .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "diffs") . " | " .
-		      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree") .
+		print "<div class=\"page_nav\">\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree") .
 		      "<br/><br/>\n" .
 		      "</div>\n";
 		print "<div>\n" .
@@ -665,7 +974,7 @@ sub git_tree {
 		print "<div class=\"page_path\">/</div>\n";
 	}
 	print "<div class=\"page_body\">\n";
-	print "<pre>\n";
+	print "<table cellspacing=\"0\">\n";
 	foreach my $line (@entries) {
 		#'100644	blob	0fa3f3a66fb6a137f6ec2c19351ed4d807070ffa	panic.c'
 		$line =~ m/^([0-9]+)\t(.*)\t(.*)\t(.*)$/;
@@ -674,26 +983,28 @@ sub git_tree {
 		my $t_hash = $3;
 		my $t_name = $4;
 		$file_key = ";f=$base$t_name";
+		print "<tr>\n" .
+		      "<td class=\"pre\">" . mode_str($t_mode) . "</td>\n";
 		if ($t_type eq "blob") {
-			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key}, $t_name);
-			if (S_ISLNK(oct $t_mode)) {
-				open my $fd, "-|", "$gitbin/git-cat-file blob $t_hash";
-				my $target = <$fd>;
-				close $fd;
-				print "\t -> $target";
-			}
-			print "\n";
+			print "<td class=\"pre\">$t_name</td>\n";
+			print "<td class=\"link\">" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key}, "blob") .
+			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base" . $file_key}, "history") .
+			      "</td>\n";
 		} elsif ($t_type eq "tree") {
-			print mode_str($t_mode). " " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, $t_name) . "\n";
+			print "<td class=\"pre\">" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key}, $t_name) .
+			      "</td>\n";
 		}
+		print "</tr>\n";
 	}
-	print "</pre>\n";
-	print "</div>";
+	print "</table>\n" .
+	      "</div>";
 	git_footer_html();
 }
 
 sub git_rss {
-	open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_head($project) || die_error(undef, "Open failed.");
+	open my $fd, "-|", "$gitbin/git-rev-list --max-count=20 " . git_read_hash("$project/HEAD") || die_error(undef, "Open failed.");
 	my (@revlist) = map { chomp; $_ } <$fd>;
 	close $fd || die_error(undef, "Reading rev-list failed.");
 
@@ -702,7 +1013,7 @@ sub git_rss {
 	      "<rss version=\"0.91\">\n";
 	print "<channel>\n";
 	print "<title>$project</title>\n".
-	      "<link> " . $my_url . "/$project/log</link>\n".
+	      "<link> $my_url/$project/log</link>\n".
 	      "<description>$project log</description>\n".
 	      "<language>en</language>\n";
 
@@ -710,8 +1021,8 @@ sub git_rss {
 		my %co = git_read_commit($commit);
 		my %ad = date_str($co{'author_epoch'});
 		print "<item>\n" .
-		      "\t<title>" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'min'}) . " - " . escapeHTML($co{'title'}) . "</title>\n" .
-		      "\t<link> " . $my_url . "?p=$project;a=commit;h=$commit</link>\n" .
+		      "\t<title>" . sprintf("%d %s %02d:%02d", $ad{'mday'}, $ad{'month'}, $ad{'hour'}, $ad{'minute'}) . " - " . escapeHTML($co{'title'}) . "</title>\n" .
+		      "\t<link> $my_url?p=$project;a=commit;h=$commit</link>\n" .
 		      "\t<description>";
 		my $comment = $co{'comment'};
 		foreach my $line (@$comment) {
@@ -724,7 +1035,9 @@ sub git_rss {
 }
 
 sub git_log {
-	my $head = git_read_head($project);
+	if (!defined $hash) {
+		$hash = git_read_hash("$project/HEAD");
+	}
 	my $limit_option = "";
 	if (!defined $time_back) {
 		$limit_option = "--max-count=10";
@@ -732,25 +1045,24 @@ sub git_log {
 		my $date = time - $time_back*24*60*60;
 		$limit_option = "--max-age=$date";
 	}
-	open my $fd, "-|", "$gitbin/git-rev-list $limit_option $head" || die_error(undef, "Open failed.");
+	open my $fd, "-|", "$gitbin/git-rev-list $limit_option $hash" || die_error(undef, "Open failed.");
 	my (@revlist) = map { chomp; $_ } <$fd>;
 	close $fd || die_error(undef, "Reading rev-list failed.");
 
 	git_header_html();
 	print "<div class=\"page_nav\">\n";
-	print "view  ";
 	print $cgi->a({-href => "$my_uri?p=$project;a=log"}, "last 10") . " | " .
 	      $cgi->a({-href => "$my_uri?p=$project;a=log;t=1"}, "day") . " | " .
 	      $cgi->a({-href => "$my_uri?p=$project;a=log;t=7"}, "week") . " | " .
 	      $cgi->a({-href => "$my_uri?p=$project;a=log;t=31"}, "month") . " | " .
 	      $cgi->a({-href => "$my_uri?p=$project;a=log;t=365"}, "year") . " | " .
 	      $cgi->a({-href => "$my_uri?p=$project;a=log;t=0"}, "all") . "<br/>\n";
-	print "<br/><br/>\n" .
+	print "<br/>\n" .
 	      "</div>\n";
 
 	if (!@revlist) {
-		my %co = git_read_commit($head);
-		print "<div class=\"page_body\"> Last change " . $co{'age_string'} . ".<br/><br/></div>\n";
+		my %co = git_read_commit($hash);
+		print "<div class=\"page_body\"> Last change $co{'age_string'}.<br/><br/></div>\n";
 	}
 
 	foreach my $commit (@revlist) {
@@ -759,20 +1071,21 @@ sub git_log {
 		my %ad = date_str($co{'author_epoch'});
 		print "<div>\n" .
 		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"},
-		      "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\n" .
+		      "<span class=\"age\">$co{'age_string'}</span>" . escapeHTML($co{'title'})) . "\n" .
 		      "</div>\n";
 		print "<div class=\"title_text\">\n" .
 		      "<div class=\"log_link\">\n" .
-		      "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "<br/>\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "commitdiff") .
+		      "<br/>\n" .
 		      "</div>\n" .
-		      "<i>" . escapeHTML($co{'author_name'}) .  " [" . $ad{'rfc2822'} . "]</i><br/>\n" .
+		      "<i>" . escapeHTML($co{'author_name'}) .  " [$ad{'rfc2822'}]</i><br/>\n" .
 		      "</div>\n" .
 		      "<div class=\"log_body\">\n";
 		my $comment = $co{'comment'};
 		my $empty = 0;
 		foreach my $line (@$comment) {
-			if ($line =~ m/^(signed.off|acked).by/i) {
+			if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
 				next;
 			}
 			if ($line eq "") {
@@ -803,7 +1116,7 @@ sub git_commit {
 
 	my @difftree;
 	if (defined $co{'parent'}) {
-		open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed.");
+		open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed.");
 		@difftree = map { chomp; $_ } <$fd>;
 		close $fd || die_error(undef, "Reading diff-tree failed.");
 	} else {
@@ -813,10 +1126,13 @@ sub git_commit {
 		close $fd || die_error(undef, "Reading ls-tree failed.");
 	}
 	git_header_html();
-	print "<div class=\"page_nav\"> view\n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") . "\n" .
+	print "<div class=\"page_nav\">\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit");
+	if (defined $co{'parent'}) {
+		print " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff");
+	}
+	print " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") . "\n" .
 	      "<br/><br/></div>\n";
 	if (defined $co{'parent'}) {
 		print "<div>\n" .
@@ -824,13 +1140,13 @@ sub git_commit {
 		      "</div>\n";
 	} else {
 		print "<div>\n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
 		      "</div>\n";
 	}
 	print "<div class=\"title_text\">\n" .
 	      "<table cellspacing=\"0\">\n";
 	print "<tr><td>author</td><td>" . escapeHTML($co{'author'}) . "</td></tr>\n".
-	      "<tr><td></td><td> " . $ad{'rfc2822'};
+	      "<tr><td></td><td> $ad{'rfc2822'}";
 	if ($ad{'hour_local'} < 6) {
 		printf(" (<span style=\"color: #cc0000;\">%02d:%02d</span> %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});
 	} else {
@@ -838,11 +1154,10 @@ sub git_commit {
 	}
 	print "</td></tr>\n";
 	print "<tr><td>committer</td><td>" . escapeHTML($co{'committer'}) . "</td></tr>\n";
-	print "<tr><td></td><td> " . $cd{'rfc2822'} .
-	      sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</td></tr>\n";
+	print "<tr><td></td><td> $cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "</td></tr>\n";
 	print "<tr><td>commit</td><td style=\"font-family: monospace;\">$hash</td></tr>\n";
 	print "<tr><td>tree</td><td style=\"font-family: monospace;\">" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=" . $hash}, $co{'tree'}) . "</td></tr>\n";
+	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, $co{'tree'}) . "</td></tr>\n";
 	my $parents  = $co{'parents'};
 	foreach my $par (@$parents) {
 		print "<tr><td>parent</td><td style=\"font-family: monospace;\">" .
@@ -864,7 +1179,7 @@ sub git_commit {
 		} else {
 			$empty = 0;
 		}
-		if ($line =~ m/(signed.off|acked).by/i) {
+		if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
 			$signed = 1;
 			print "<span style=\"color: #888888\">" . escapeHTML($line) . "</span><br/>\n";
 		} else {
@@ -897,21 +1212,19 @@ sub git_commit {
 				}
 				print "<div class=\"list\">\n" .
 				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"},
-				      escapeHTML($file) . " <span style=\"color: #008000;\">[new " . file_type($mode) . $mode_chng . "]</span>") . "\n" .
-				      "</div>";
-				print "<div class=\"link\">\n" .
-				      "view " .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "file") . "<br/>\n" .
+				      escapeHTML($file) . " <span style=\"color: #008000;\">[new " . file_type($mode) . "$mode_chng]</span>") . "\n" .
+				      "</div>\n";
+				print "<div class=\"list_link\">\n" .
+				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . "\n" .
 				      "</div>\n";
 			} elsif ($op eq "-") {
 				print "<div class=\"list\">\n" .
 				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"},
 				      escapeHTML($file) .  " <span style=\"color: #c00000;\">[deleted " . file_type($mode) . "]</span>") . "\n" .
 				      "</div>";
-				print "<div class=\"link\">\n" .
-				      "view " .
-				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "file") . " | " .
-				      $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
+				print "<div class=\"list_link\">\n" .
+				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, "blob") . " | " .
+				      $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" .
 				      "</div>\n";
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
@@ -922,7 +1235,7 @@ sub git_commit {
 				my $to_mode = $2;
 				my $mode_chnge = "";
 				if ($from_mode != $to_mode) {
-					$mode_chnge = " <span style=\"color: #888888;\">[changed";
+					$mode_chnge = " <span style=\"color: #777777;\">[changed";
 					if (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {
 						$mode_chnge .= " from " . file_type($from_mode) . " to " . file_type($to_mode);
 					}
@@ -945,13 +1258,12 @@ sub git_commit {
 					      escapeHTML($file) . $mode_chnge) . "\n" .
 					      "</div>\n";
 				}
-				print "<div class=\"link\">\n" .
-				      "view ";
+				print "<div class=\"list_link\">\n";
 				if ($to_id ne $from_id) {
 					print $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"}, "diff") . " | ";
 				}
-				print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "file") . " | " .
-				      $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "<br/>\n" .
+				print $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, "blob") . " | " .
+				      $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash;f=$file"}, "history") . "\n" .
 				      "</div>\n";
 			}
 		}
@@ -963,10 +1275,11 @@ sub git_blobdiff {
 	mkdir($gittmp, 0700);
 	git_header_html();
 	if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
-		print "<div class=\"page_nav\"> view\n" .
-		      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
-		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "diffs") .
-		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash_base"}, "tree");
+		print "<div class=\"page_nav\">\n" .
+		      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash_base"}, "commit") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash_base"}, "commitdiff") .
+		      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base"}, "tree");
 			if (defined $file_name) {
 				print " | " . $cgi->a({-href => "$my_uri?p=$project;a=history;h=$hash_base;f=$file_name"}, "history");
 			}
@@ -986,15 +1299,13 @@ sub git_blobdiff {
 		      "</div>\n";
 	}
 	print "<div class=\"page_body\">\n" .
-	      "<pre>\n";
-	print "<span class=\"diff_info\">blob:" .
+	      "<div class=\"diff_info\">blob:" .
 	      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name"}, $hash_parent) .
 	      " -> blob:" .
 	      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name"}, $hash) .
-	      "</span>\n";
+	      "</div>\n";
 	git_diff_html($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash);
-	print "</pre>\n" .
-	      "</div>";
+	print "</div>";
 	git_footer_html();
 }
 
@@ -1004,21 +1315,44 @@ sub git_commitdiff {
 	if (!%co) {
 		die_error(undef, "Unknown commit object.");
 	}
-	open my $fd, "-|", "$gitbin/git-diff-tree -r " . $co{'parent'} . " $hash" || die_error(undef, "Open failed.");
+	open my $fd, "-|", "$gitbin/git-diff-tree -r $co{'parent'} $hash" || die_error(undef, "Open failed.");
 	my (@difftree) = map { chomp; $_ } <$fd>;
 	close $fd || die_error(undef, "Reading diff-tree failed.");
 
 	git_header_html();
-	print "<div class=\"page_nav\"> view\n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | \n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | \n" .
-	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$hash"}, "tree") . "\n" .
+	print "<div class=\"page_nav\">\n" .
+	      $cgi->a({-href => "$my_uri?p=$project;a=log"}, "log") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") .
+	      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$hash"}, "tree") .
 	      "<br/><br/></div>\n";
 	print "<div>\n" .
 	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" .
 	      "</div>\n";
-	print "<div class=\"page_body\">\n" .
-	      "<pre>\n";
+	print "<div class=\"page_body\">\n";
+	my $comment = $co{'comment'};
+	my $empty = 0;
+	my $signed = 0;
+	my @log = @$comment;
+	shift @log;
+	#while ($log[0] eq "") {
+	#	shift @log;
+	#}
+	foreach my $line (@log) {
+		if ($line =~ m/^(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
+			next;
+		}
+		if ($line eq "") {
+			if ($empty) {
+				next;
+			}
+			$empty = 1;
+		} else {
+			$empty = 0;
+		}
+		print escapeHTML($line) . "<br/>\n";
+	}
+	print "<br/>\n";
 	foreach my $line (@difftree) {
 		# '*100644->100644	blob	8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716->8da3a306d0c0c070d87048d14a033df02f40a154	Makefile'
 		$line =~ m/^(.)(.*)\t(.*)\t(.*)\t(.*)$/;
@@ -1029,14 +1363,14 @@ sub git_commitdiff {
 		my $file = $5;
 		if ($type eq "blob") {
 			if ($op eq "+") {
-				print "<span class=\"diff_info\">" .  file_type($mode) . ":" .
+				print "<div class=\"diff_info\">" .  file_type($mode) . ":" .
 				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(new)" .
-				      "</span>\n";
+				      "</div>\n";
 				git_diff_html(undef, "/dev/null", $id, "b/$file");
 			} elsif ($op eq "-") {
-				print "<span class=\"diff_info\">" . file_type($mode) . ":" .
+				print "<div class=\"diff_info\">" . file_type($mode) . ":" .
 				      $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id;hb=$hash;f=$file"}, $id) . "(deleted)" .
-				      "</span>\n";
+				      "</div>\n";
 				git_diff_html($id, "a/$file", undef, "/dev/null");
 			} elsif ($op eq "*") {
 				$id =~ m/([0-9a-fA-F]+)->([0-9a-fA-F]+)/;
@@ -1046,34 +1380,34 @@ sub git_commitdiff {
 				my $from_mode = $1;
 				my $to_mode = $2;
 				if ($from_id ne $to_id) {
-					print "<span class=\"diff_info\">" .
+					print "<div class=\"diff_info\">" .
 					      file_type($from_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"}, $from_id) .
 					      " -> " .
 					      file_type($to_mode) . ":" . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"}, $to_id);
-					print "</span>\n";
+					print "</div>\n";
 					git_diff_html($from_id, "a/$file",  $to_id, "b/$file");
 				}
 			}
 		}
 	}
-	print "</pre><br/>\n";
-	print "</div>";
+	print "<br/>\n" .
+	      "</div>";
 	git_footer_html();
 }
 
 sub git_history {
 	if (!defined $hash) {
-		$hash = git_read_head($project);
+		$hash = git_read_hash("$project/HEAD");
 	}
 	my %co = git_read_commit($hash);
 	if (!%co) {
 		die_error(undef, "Unknown commit object.");
 	}
 	git_header_html();
-	print "<div class=\"page_nav\"> view\n" .
+	print "<div class=\"page_nav\">\n" .
 	      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash"}, "commit") . " | " .
-	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "diffs") . " | " .
-	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" . $co{'tree'} . ";hb=$hash"}, "tree") .
+	      $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash"}, "commitdiff") . " | " .
+	      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"}, "tree") .
 	      "<br/><br/>\n" .
 	      "</div>\n";
 	print "<div>\n" .
@@ -1101,12 +1435,18 @@ sub git_history {
 			}
 			print "<div class=\"list\">\n" .
 			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"},
-			      "<span class=\"log_age\">" . $co{'age_string'} . "</span>" . escapeHTML($co{'title'})) . "\n" .
+			      "<span class=\"age\">$co{'age_string'}</span>" . escapeHTML($co{'title'})) . "\n" .
 			      "</div>\n";
-			print "<div class=\"link\">\n" .
-			      "view " .
-			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " .
-			      $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$commit"}, "tree") . "<br/><br/>\n" .
+			print "<div class=\"list_link\">\n" .
+			      $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") .
+			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=" .  $co{'tree'} . ";hb=$commit"}, "tree") .
+			      " | " . $cgi->a({-href => "$my_uri?p=$project;a=blob;hb=$commit;f=$file"}, "blob");
+			my $blob = git_get_hash_by_path($hash, $file_name);
+			my $blob_parent = git_get_hash_by_path($commit, $file_name);
+			if (defined $blob && defined $blob_parent && $blob ne $blob_parent) {
+				print " | " . $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file"}, "diff");
+			}
+			print "<br/>\n" .
 			      "</div>\n";
 			undef $commit;
 		}