X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/4e00d338b07245829adf2446a05fe4925b691092..3e244a0ccaef8303302a2c462f36b8bdf3634a46:/ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 1dbb39d..430231e 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,6 +1,6 @@
 /* ui-patch.c: generate patch view
  *
- * Copyright (C) 2007 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -25,22 +25,26 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 		new_rev = ctx.qry.head;
 
 	if (get_sha1(new_rev, new_rev_sha1)) {
-		cgit_print_error("Bad object id: %s", new_rev);
+		cgit_print_error_page(404, "Not found",
+				"Bad object id: %s", new_rev);
 		return;
 	}
 	commit = lookup_commit_reference(new_rev_sha1);
 	if (!commit) {
-		cgit_print_error("Bad commit reference: %s", new_rev);
+		cgit_print_error_page(404, "Not found",
+				"Bad commit reference: %s", new_rev);
 		return;
 	}
 
 	if (old_rev) {
 		if (get_sha1(old_rev, old_rev_sha1)) {
-			cgit_print_error("Bad object id: %s", old_rev);
+			cgit_print_error_page(404, "Not found",
+					"Bad object id: %s", old_rev);
 			return;
 		}
 		if (!lookup_commit_reference(old_rev_sha1)) {
-			cgit_print_error("Bad commit reference: %s", old_rev);
+			cgit_print_error_page(404, "Not found",
+					"Bad commit reference: %s", old_rev);
 			return;
 		}
 	} else if (commit->parents && commit->parents->item) {
@@ -59,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 	patchname = fmt("%s.patch", rev_range);
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = patchname;
-	cgit_print_http_headers(&ctx);
+	cgit_print_http_headers();
 
 	if (ctx.cfg.noplainemail) {
 		rev_argv[2] = "--format=format:From %H Mon Sep 17 00:00:00 "
@@ -72,13 +76,17 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
 	rev.verbose_header = 1;
 	rev.diff = 1;
 	rev.show_root_diff = 1;
-	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+	rev.max_parents = 1;
+	rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
+			DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
 	setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
 			NULL);
 	prepare_revision_walk(&rev);
 
 	while ((commit = get_revision(&rev)) != NULL) {
 		log_tree_commit(&rev, commit);
-		printf("--\ncgit %s\n", cgit_version);
+		printf("-- \ncgit %s\n\n", cgit_version);
 	}
+
+	fflush(stdout);
 }