X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=stagit.c;h=bb8b404f49b7f70be9aa27284183a904f396a383;hb=dee83b1f1087f9f56114741c6dff52a01ed0d7cb;hp=d9832945177342903d3ff2696ab6d4e86a6b03ed;hpb=0f05e4b4f0f7dad20b26d60aa350b90fb47f1eb8;p=stagit.git diff --git a/stagit.c b/stagit.c index d983294..bb8b404 100644 --- a/stagit.c +++ b/stagit.c @@ -1,13 +1,15 @@ #include +#include #include #include -#include #include #include +#include #include #include #include +#include #include #include @@ -46,11 +48,6 @@ struct commitinfo { size_t ndeltas; }; -/* summary length (bytes) in the log */ -static const unsigned summarylen = 70; -/* display line count or file size in file tree index */ -static const int showlinecount = 1; - static git_repository *repo; static const char *relpath = ""; @@ -60,18 +57,19 @@ static char *name = ""; static char *strippedname = ""; static char description[255]; static char cloneurl[1024]; -static int haslicense, hasreadme, hassubmodules; +static char *submodules; +static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" }; +static char *license; +static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" }; +static char *readme; +static long long nlogcommits = -1; /* < 0 indicates not used */ /* cache */ static git_oid lastoid; -static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + nul byte */ +static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */ static FILE *rcachefp, *wcachefp; static const char *cachefile; -#ifndef USE_PLEDGE -#define pledge(p1,p2) 0 -#endif - void joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) { @@ -79,7 +77,7 @@ joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) r = snprintf(buf, bufsiz, "%s%s%s", path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); - if (r == -1 || (size_t)r >= bufsiz) + if (r < 0 || (size_t)r >= bufsiz) errx(1, "path truncated: '%s%s%s'", path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); } @@ -90,7 +88,7 @@ deltainfo_free(struct deltainfo *di) if (!di) return; git_patch_free(di->patch); - di->patch = NULL; + memset(di, 0, sizeof(*di)); free(di); } @@ -98,6 +96,8 @@ int commitinfo_getstats(struct commitinfo *ci) { struct deltainfo *di; + git_diff_options opts; + git_diff_find_options fopts; const git_diff_delta *delta; const git_diff_hunk *hunk; const git_diff_line *line; @@ -105,17 +105,40 @@ commitinfo_getstats(struct commitinfo *ci) size_t ndeltas, nhunks, nhunklines; size_t i, j, k; + if (git_tree_lookup(&(ci->commit_tree), repo, git_commit_tree_id(ci->commit))) + goto err; + if (!git_commit_parent(&(ci->parent), ci->commit, 0)) { + if (git_tree_lookup(&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) { + ci->parent = NULL; + ci->parent_tree = NULL; + } + } + + git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION); + opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH | + GIT_DIFF_IGNORE_SUBMODULES | + GIT_DIFF_INCLUDE_TYPECHANGE; + if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)) + goto err; + + if (git_diff_find_init_options(&fopts, GIT_DIFF_FIND_OPTIONS_VERSION)) + goto err; + /* find renames and copies, exact matches (no heuristic) for renames. */ + fopts.flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES | + GIT_DIFF_FIND_EXACT_MATCH_ONLY; + if (git_diff_find_similar(ci->diff, &fopts)) + goto err; + ndeltas = git_diff_num_deltas(ci->diff); if (ndeltas && !(ci->deltas = calloc(ndeltas, sizeof(struct deltainfo *)))) err(1, "calloc"); for (i = 0; i < ndeltas; i++) { + if (git_patch_from_diff(&patch, ci->diff, i)) + goto err; + if (!(di = calloc(1, sizeof(struct deltainfo)))) err(1, "calloc"); - if (git_patch_from_diff(&patch, ci->diff, i)) { - git_patch_free(patch); - goto err; - } di->patch = patch; ci->deltas[i] = di; @@ -148,6 +171,15 @@ commitinfo_getstats(struct commitinfo *ci) return 0; err: + git_diff_free(ci->diff); + ci->diff = NULL; + git_tree_free(ci->commit_tree); + ci->commit_tree = NULL; + git_tree_free(ci->parent_tree); + ci->parent_tree = NULL; + git_commit_free(ci->parent); + ci->parent = NULL; + if (ci->deltas) for (i = 0; i < ci->ndeltas; i++) deltainfo_free(ci->deltas[i]); @@ -171,20 +203,21 @@ commitinfo_free(struct commitinfo *ci) if (ci->deltas) for (i = 0; i < ci->ndeltas; i++) deltainfo_free(ci->deltas[i]); + free(ci->deltas); - ci->deltas = NULL; git_diff_free(ci->diff); git_tree_free(ci->commit_tree); git_tree_free(ci->parent_tree); git_commit_free(ci->commit); git_commit_free(ci->parent); + memset(ci, 0, sizeof(*ci)); + free(ci); } struct commitinfo * commitinfo_getbyoid(const git_oid *id) { struct commitinfo *ci; - git_diff_options opts; if (!(ci = calloc(1, sizeof(struct commitinfo)))) err(1, "calloc"); @@ -201,27 +234,10 @@ commitinfo_getbyoid(const git_oid *id) ci->summary = git_commit_summary(ci->commit); ci->msg = git_commit_message(ci->commit); - if (git_tree_lookup(&(ci->commit_tree), repo, git_commit_tree_id(ci->commit))) - goto err; - if (!git_commit_parent(&(ci->parent), ci->commit, 0)) { - if (git_tree_lookup(&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) { - ci->parent = NULL; - ci->parent_tree = NULL; - } - } - - git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION); - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)) - goto err; - if (commitinfo_getstats(ci) == -1) - goto err; - return ci; err: commitinfo_free(ci); - free(ci); return NULL; } @@ -232,7 +248,7 @@ efopen(const char *name, const char *flags) FILE *fp; if (!(fp = fopen(name, flags))) - err(1, "fopen"); + err(1, "fopen: '%s'", name); return fp; } @@ -247,7 +263,7 @@ xmlencode(FILE *fp, const char *s, size_t len) switch(*s) { case '<': fputs("<", fp); break; case '>': fputs(">", fp); break; - case '\'': fputs("'", fp); break; + case '\'': fputs("'", fp); break; case '&': fputs("&", fp); break; case '"': fputs(""", fp); break; default: fputc(*s, fp); @@ -299,7 +315,7 @@ printtime(FILE *fp, const git_time *intime) t = (time_t)intime->time + (intime->offset * 60); if (!(intm = gmtime(&t))) return; - strftime(out, sizeof(out), "%a %b %e %H:%M:%S", intm); + strftime(out, sizeof(out), "%a, %e %b %Y %H:%M:%S", intm); if (intime->offset < 0) fprintf(fp, "%s -%02d%02d", out, -(intime->offset) / 60, -(intime->offset) % 60); @@ -349,22 +365,25 @@ writeheader(FILE *fp, const char *title) xmlencode(fp, description, strlen(description)); fputs("", fp); if (cloneurl[0]) { - fputs("git clone git clone ", fp); xmlencode(fp, cloneurl, strlen(cloneurl)); - fputs("", fp); + fputs("", fp); } fputs("\n", fp); fprintf(fp, "Log | ", relpath); fprintf(fp, "Files | ", relpath); fprintf(fp, "Refs", relpath); - if (hassubmodules) - fprintf(fp, " | Submodules", relpath); - if (hasreadme) - fprintf(fp, " | README", relpath); - if (haslicense) - fprintf(fp, " | LICENSE", relpath); + if (submodules) + fprintf(fp, " | Submodules", + relpath, submodules); + if (readme) + fprintf(fp, " | README", + relpath, readme); + if (license) + fprintf(fp, " | LICENSE", + relpath, license); fputs("\n
\n
\n", fp); } @@ -377,28 +396,33 @@ writefooter(FILE *fp) int writeblobhtml(FILE *fp, const git_blob *blob) { - off_t i; - size_t n = 0; - char *nfmt = "%d\n"; + size_t n = 0, i, prev; + const char *nfmt = "%7d"; const char *s = git_blob_rawcontent(blob); git_off_t len = git_blob_rawsize(blob); - fputs("
\n", fp);
+	fputs("
\n", fp);
 
-	if (len) {
-		n++;
-		fprintf(fp, nfmt, n, n, n);
-		for (i = 0; i < len - 1; i++) {
-			if (s[i] == '\n') {
-				n++;
-				fprintf(fp, nfmt, n, n, n);
-			}
+	if (len > 0) {
+		for (i = 0, prev = 0; i < (size_t)len; i++) {
+			if (s[i] != '\n')
+				continue;
+			n++;
+			fprintf(fp, nfmt, n, n, n);
+			xmlencode(fp, &s[prev], i - prev + 1);
+			fprintf(fp, "");
+			prev = i + 1;
+		}
+		/* trailing data */
+		if ((len - prev) > 0) {
+			n++;
+			fprintf(fp, nfmt, n, n, n);
+			xmlencode(fp, &s[prev], len - prev);
+			fprintf(fp, "");
 		}
 	}
 
-	fputs("
\n", fp);
-	xmlencode(fp, s, (size_t)len);
-	fputs("
\n", fp); + fputs("\n", fp); return n; } @@ -440,6 +464,7 @@ printshowfile(FILE *fp, struct commitinfo *ci) git_patch *patch; size_t nhunks, nhunklines, changed, add, del, total, i, j, k; char linestr[80]; + int c; printcommit(fp, ci); @@ -458,7 +483,22 @@ printshowfile(FILE *fp, struct commitinfo *ci) fputs("Diffstat:\n", fp); for (i = 0; i < ci->ndeltas; i++) { delta = git_patch_get_delta(ci->deltas[i]->patch); - fprintf(fp, "\n", fp); } - fprintf(fp, "
", i); + + switch (delta->status) { + case GIT_DELTA_ADDED: c = 'A'; break; + case GIT_DELTA_COPIED: c = 'C'; break; + case GIT_DELTA_DELETED: c = 'D'; break; + case GIT_DELTA_MODIFIED: c = 'M'; break; + case GIT_DELTA_RENAMED: c = 'R'; break; + case GIT_DELTA_TYPECHANGE: c = 'T'; break; + default: c = ' '; break; + } + if (c == ' ') + fprintf(fp, "
%c", c); + else + fprintf(fp, "
%c", c, c); + + fprintf(fp, "", i); xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path)); if (strcmp(delta->old_file.path, delta->new_file.path)) { fputs(" -> ", fp); @@ -485,7 +525,7 @@ printshowfile(FILE *fp, struct commitinfo *ci) fwrite(&linestr[add], 1, del, fp); fputs("
%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n", + fprintf(fp, "
%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n",
 		ci->filecount, ci->filecount == 1 ? "" : "s",
 	        ci->addcount,  ci->addcount  == 1 ? "" : "s",
 	        ci->delcount,  ci->delcount  == 1 ? "" : "s");
@@ -495,9 +535,15 @@ printshowfile(FILE *fp, struct commitinfo *ci)
 	for (i = 0; i < ci->ndeltas; i++) {
 		patch = ci->deltas[i]->patch;
 		delta = git_patch_get_delta(patch);
-		fprintf(fp, "diff --git a/%s b/%s\n",
-			i, relpath, delta->old_file.path, delta->old_file.path,
-			relpath, delta->new_file.path, delta->new_file.path);
+		fprintf(fp, "diff --git a/old_file.path, strlen(delta->old_file.path));
+		fputs(".html\">", fp);
+		xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+		fprintf(fp, " b/new_file.path, strlen(delta->new_file.path));
+		fprintf(fp, ".html\">");
+		xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+		fprintf(fp, "\n");
 
 		/* check binary data */
 		if (delta->flags & GIT_DIFF_FLAG_BINARY) {
@@ -536,30 +582,23 @@ printshowfile(FILE *fp, struct commitinfo *ci)
 void
 writelogline(FILE *fp, struct commitinfo *ci)
 {
-	size_t len;
-
 	fputs("", fp);
 	if (ci->author)
 		printtimeshort(fp, &(ci->author->when));
 	fputs("", fp);
 	if (ci->summary) {
 		fprintf(fp, "", relpath, ci->oid);
-		if ((len = strlen(ci->summary)) > summarylen) {
-			xmlencode(fp, ci->summary, summarylen - 1);
-			fputs("…", fp);
-		} else {
-			xmlencode(fp, ci->summary, len);
-		}
+		xmlencode(fp, ci->summary, strlen(ci->summary));
 		fputs("", fp);
 	}
 	fputs("", fp);
 	if (ci->author)
 		xmlencode(fp, ci->author->name, strlen(ci->author->name));
-	fputs("", fp);
+	fputs("", fp);
 	fprintf(fp, "%zu", ci->filecount);
-	fputs("", fp);
+	fputs("", fp);
 	fprintf(fp, "+%zu", ci->addcount);
-	fputs("", fp);
+	fputs("", fp);
 	fprintf(fp, "-%zu", ci->delcount);
 	fputs("\n", fp);
 }
@@ -570,13 +609,12 @@ writelog(FILE *fp, const git_oid *oid)
 	struct commitinfo *ci;
 	git_revwalk *w = NULL;
 	git_oid id;
-	char path[PATH_MAX];
+	char path[PATH_MAX], oidstr[GIT_OID_HEXSZ + 1];
 	FILE *fpfile;
 	int r;
 
 	git_revwalk_new(&w, repo);
 	git_revwalk_push(w, oid);
-	git_revwalk_sorting(w, GIT_SORT_TIME);
 	git_revwalk_simplify_first_parent(w);
 
 	while (!git_revwalk_next(&id, w)) {
@@ -584,21 +622,41 @@ writelog(FILE *fp, const git_oid *oid)
 
 		if (cachefile && !memcmp(&id, &lastoid, sizeof(id)))
 			break;
+
+		git_oid_tostr(oidstr, sizeof(oidstr), &id);
+		r = snprintf(path, sizeof(path), "commit/%s.html", oidstr);
+		if (r < 0 || (size_t)r >= sizeof(path))
+			errx(1, "path truncated: 'commit/%s.html'", oidstr);
+		r = access(path, F_OK);
+
+		/* optimization: if there are no log lines to write and
+		   the commit file already exists: skip the diffstat */
+		if (!nlogcommits && !r)
+			continue;
+
 		if (!(ci = commitinfo_getbyoid(&id)))
 			break;
+		/* diffstat: for stagit HTML required for the log.html line */
+		if (commitinfo_getstats(ci) == -1)
+			goto err;
+
+		if (nlogcommits < 0) {
+			writelogline(fp, ci);
+		} else if (nlogcommits > 0) {
+			writelogline(fp, ci);
+			nlogcommits--;
+			if (!nlogcommits && ci->parentoid[0])
+				fputs(""
+				      "More commits remaining [...]"
+				      "\n", fp);
+		}
 
-		writelogline(fp, ci);
 		if (cachefile)
 			writelogline(wcachefp, ci);
 
-		relpath = "../";
-
-		r = snprintf(path, sizeof(path), "commit/%s.html", ci->oid);
-		if (r == -1 || (size_t)r >= sizeof(path))
-			errx(1, "path truncated: 'commit/%s.html'", ci->oid);
-
 		/* check if file exists if so skip it */
-		if (access(path, F_OK)) {
+		if (r) {
+			relpath = "../";
 			fpfile = efopen(path, "w");
 			writeheader(fpfile, ci->summary);
 			fputs("
", fpfile);
@@ -607,6 +665,7 @@ writelog(FILE *fp, const git_oid *oid)
 			writefooter(fpfile);
 			fclose(fpfile);
 		}
+err:
 		commitinfo_free(ci);
 	}
 	git_revwalk_free(w);
@@ -637,11 +696,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
 		xmlencode(fp, ci->summary, strlen(ci->summary));
 		fputs("\n", fp);
 	}
-	fprintf(fp, "",
+	fprintf(fp, "\n",
 	        ci->oid);
 
 	if (ci->author) {
-		fputs("", fp);
+		fputs("\n", fp);
 		xmlencode(fp, ci->author->name, strlen(ci->author->name));
 		fputs("\n", fp);
 		xmlencode(fp, ci->author->email, strlen(ci->author->email));
@@ -685,7 +744,6 @@ writeatom(FILE *fp)
 
 	git_revwalk_new(&w, repo);
 	git_revwalk_push_head(w);
-	git_revwalk_sorting(w, GIT_SORT_TIME);
 	git_revwalk_simplify_first_parent(w);
 
 	for (i = 0; i < m && !git_revwalk_next(&id, w); i++) {
@@ -696,7 +754,7 @@ writeatom(FILE *fp)
 	}
 	git_revwalk_free(w);
 
-	fputs("", fp);
+	fputs("\n", fp);
 
 	return 0;
 }
@@ -807,7 +865,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
 
 		r = snprintf(filepath, sizeof(filepath), "file/%s.html",
 		         entrypath);
-		if (r == -1 || (size_t)r >= sizeof(filepath))
+		if (r < 0 || (size_t)r >= sizeof(filepath))
 			errx(1, "path truncated: 'file/%s.html'", entrypath);
 
 		if (!git_tree_entry_to_object(&obj, repo, entry)) {
@@ -832,10 +890,12 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
 
 			fputs("", fp);
 			fputs(filemode(git_tree_entry_filemode(entry)), fp);
-			fprintf(fp, "", relpath, filepath);
+			fprintf(fp, "", fp);
 			xmlencode(fp, entrypath, strlen(entrypath));
-			fputs("", fp);
-			if (showlinecount && lc > 0)
+			fputs("", fp);
+			if (lc > 0)
 				fprintf(fp, "%dL", lc);
 			else
 				fprintf(fp, "%juB", (uintmax_t)filesize);
@@ -846,7 +906,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
 				relpath);
 			xmlencode(fp, entrypath, strlen(entrypath));
 			git_submodule_free(module);
-			fputs("\n", fp);
+			fputs("\n", fp);
 		}
 	}
 
@@ -861,7 +921,8 @@ writefiles(FILE *fp, const git_oid *id)
 	int ret = -1;
 
 	fputs("\n"
-	      ""
+	      ""
+	      ""
 	      "\n\n", fp);
 
 	if (!git_commit_lookup(&commit, repo, id) &&
@@ -945,9 +1006,12 @@ writerefs(FILE *fp)
 
 			/* print header if it has an entry (first). */
 			if (++count == 1) {
-				fprintf(fp, "
%s
ModeNameSizeModeNameSize
\n"
-				      "\n\n\n",
-				      titles[j], ids[j]);
+				fprintf(fp, "
%s
NameLast commit dateAuthor
"
+			                "\n"
+				        ""
+				        "\n\n"
+				        "\n",
+				         titles[j], ids[j]);
 			}
 
 			relpath = "";
@@ -990,7 +1054,7 @@ err:
 void
 usage(char *argv0)
 {
-	fprintf(stderr, "%s [-c cachefile] repodir\n", argv0);
+	fprintf(stderr, "%s [-c cachefile | -l commits] repodir\n", argv0);
 	exit(1);
 }
 
@@ -999,25 +1063,30 @@ main(int argc, char *argv[])
 {
 	git_object *obj = NULL;
 	const git_oid *head = NULL;
-	const git_error *e = NULL;
+	mode_t mask;
 	FILE *fp, *fpread;
 	char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
 	char tmppath[64] = "cache.XXXXXXXXXXXX", buf[BUFSIZ];
 	size_t n;
 	int i, fd;
 
-	if (pledge("stdio rpath wpath cpath", NULL) == -1)
-		err(1, "pledge");
-
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] != '-') {
 			if (repodir)
 				usage(argv[0]);
 			repodir = argv[i];
 		} else if (argv[i][1] == 'c') {
-			if (i + 1 >= argc)
+			if (nlogcommits > 0 || i + 1 >= argc)
 				usage(argv[0]);
 			cachefile = argv[++i];
+		} else if (argv[i][1] == 'l') {
+			if (cachefile || i + 1 >= argc)
+				usage(argv[0]);
+			errno = 0;
+			nlogcommits = strtoll(argv[++i], &p, 10);
+			if (argv[i][0] == '\0' || *p != '\0' ||
+			    nlogcommits <= 0 || errno)
+				usage(argv[0]);
 		}
 	}
 	if (!repodir)
@@ -1028,10 +1097,26 @@ main(int argc, char *argv[])
 
 	git_libgit2_init();
 
+#ifdef __OpenBSD__
+	if (unveil(repodir, "r") == -1)
+		err(1, "unveil: %s", repodir);
+	if (unveil(".", "rwc") == -1)
+		err(1, "unveil: .");
+	if (cachefile && unveil(cachefile, "rwc") == -1)
+		err(1, "unveil: %s", cachefile);
+
+	if (cachefile) {
+		if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
+			err(1, "pledge");
+	} else {
+		if (pledge("stdio rpath wpath cpath", NULL) == -1)
+			err(1, "pledge");
+	}
+#endif
+
 	if (git_repository_open_ext(&repo, repodir,
 		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
-		e = giterr_last();
-		fprintf(stderr, "%s: %s\n", argv[0], e->message);
+		fprintf(stderr, "%s: cannot open repository\n", argv[0]);
 		return 1;
 	}
 
@@ -1040,10 +1125,6 @@ main(int argc, char *argv[])
 		head = git_object_id(obj);
 	git_object_free(obj);
 
-	/* don't cache if there is no HEAD */
-	if (!head)
-		cachefile = NULL;
-
 	/* use directory name as name */
 	if ((name = strrchr(repodirabs, '/')))
 		name++;
@@ -1083,29 +1164,38 @@ main(int argc, char *argv[])
 	}
 
 	/* check LICENSE */
-	haslicense = (!git_revparse_single(&obj, repo, "HEAD:LICENSE") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
-	git_object_free(obj);
+	for (i = 0; i < sizeof(licensefiles) / sizeof(*licensefiles) && !license; i++) {
+		if (!git_revparse_single(&obj, repo, licensefiles[i]) &&
+		    git_object_type(obj) == GIT_OBJ_BLOB)
+			license = licensefiles[i] + strlen("HEAD:");
+		git_object_free(obj);
+	}
 
 	/* check README */
-	hasreadme = (!git_revparse_single(&obj, repo, "HEAD:README") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
-	git_object_free(obj);
+	for (i = 0; i < sizeof(readmefiles) / sizeof(*readmefiles) && !readme; i++) {
+		if (!git_revparse_single(&obj, repo, readmefiles[i]) &&
+		    git_object_type(obj) == GIT_OBJ_BLOB)
+			readme = readmefiles[i] + strlen("HEAD:");
+		git_object_free(obj);
+	}
 
-	hassubmodules = (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
+	if (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
+	    git_object_type(obj) == GIT_OBJ_BLOB)
+		submodules = ".gitmodules";
 	git_object_free(obj);
 
 	/* log for HEAD */
 	fp = efopen("log.html", "w");
 	relpath = "";
-	mkdir("commit", 0755);
+	mkdir("commit", S_IRWXU | S_IRWXG | S_IRWXO);
 	writeheader(fp, "Log");
-	fputs("
NameLast commit dateAuthor
\n"
-		  ""
-		  "\n\n", fp);
+	fputs("
DateCommit messageAuthorFiles+-
\n"
+	      ""
+	      ""
+	      ""
+	      "\n\n", fp);
 
-	if (cachefile) {
+	if (cachefile && head) {
 		/* read from cache file (does not need to exist) */
 		if ((rcachefp = fopen(cachefile, "r"))) {
 			if (!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
@@ -1118,7 +1208,7 @@ main(int argc, char *argv[])
 		if ((fd = mkstemp(tmppath)) == -1)
 			err(1, "mkstemp");
 		if (!(wcachefp = fdopen(fd, "w")))
-			err(1, "fdopen");
+			err(1, "fdopen: '%s'", tmppath);
 		/* write last commit id (HEAD) */
 		git_oid_tostr(buf, sizeof(buf), head);
 		fprintf(wcachefp, "%s\n", buf);
@@ -1168,8 +1258,14 @@ main(int argc, char *argv[])
 	fclose(fp);
 
 	/* rename new cache file on success */
-	if (cachefile && rename(tmppath, cachefile))
-		err(1, "rename: '%s' to '%s'", tmppath, cachefile);
+	if (cachefile && head) {
+		if (rename(tmppath, cachefile))
+			err(1, "rename: '%s' to '%s'", tmppath, cachefile);
+		umask((mask = umask(0)));
+		if (chmod(cachefile,
+		    (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) & ~mask))
+			err(1, "chmod: '%s'", cachefile);
+	}
 
 	/* cleanup */
 	git_repository_free(repo);

DateCommit messageAuthorFiles+-