summaryrefslogtreecommitdiffabout
authorTomas Carnecky <tom@dbservice.com>2008-12-30 10:14:52 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-30 10:16:25 (UTC)
commit03afc5fe1fe70b6e44b60708c89708060e6d5a90 (patch) (unidiff)
tree544a3aac86fdba4fb78642420f112a3e97e3389a
parentb6faa78091a1340b73e291f1f87604f246d3f391 (diff)
downloadcgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.zip
cgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.tar.gz
cgit-03afc5fe1fe70b6e44b60708c89708060e6d5a90.tar.bz2
ui-patch: whitespace changes in the patch generation code
Add a space between the committer name and email, and remove superfluous spaces in the date header. This makes cgit-generated patches match the output from git-format-patch almost exactly, at least as far as the email headers go. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-patch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-patch.c b/ui-patch.c
index e60877d..1d77336 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -92,27 +92,27 @@ void cgit_print_patch(char *hex)
92 info = cgit_parse_commit(commit); 92 info = cgit_parse_commit(commit);
93 93
94 if (commit->parents && commit->parents->item) 94 if (commit->parents && commit->parents->item)
95 hashcpy(old_sha1, commit->parents->item->object.sha1); 95 hashcpy(old_sha1, commit->parents->item->object.sha1);
96 else 96 else
97 hashclr(old_sha1); 97 hashclr(old_sha1);
98 98
99 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 99 patchname = fmt("%s.patch", sha1_to_hex(sha1));
100 ctx.page.mimetype = "text/plain"; 100 ctx.page.mimetype = "text/plain";
101 ctx.page.filename = patchname; 101 ctx.page.filename = patchname;
102 cgit_print_http_headers(&ctx); 102 cgit_print_http_headers(&ctx);
103 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 103 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
104 htmlf("From: %s%s\n", info->author, info->author_email); 104 htmlf("From: %s %s\n", info->author, info->author_email);
105 html("Date: "); 105 html("Date: ");
106 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); 106 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
107 htmlf("Subject: %s\n\n", info->subject); 107 htmlf("Subject: %s\n\n", info->subject);
108 if (info->msg && *info->msg) { 108 if (info->msg && *info->msg) {
109 htmlf("%s", info->msg); 109 htmlf("%s", info->msg);
110 if (info->msg[strlen(info->msg) - 1] != '\n') 110 if (info->msg[strlen(info->msg) - 1] != '\n')
111 html("\n"); 111 html("\n");
112 } 112 }
113 html("---\n"); 113 html("---\n");
114 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 114 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
115 html("--\n"); 115 html("--\n");
116 htmlf("cgit %s\n", CGIT_VERSION); 116 htmlf("cgit %s\n", CGIT_VERSION);
117 cgit_free_commitinfo(info); 117 cgit_free_commitinfo(info);
118} 118}