aboutsummaryrefslogtreecommitdiffstats
path: root/ui-patch.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-patch.c')
-rw-r--r--ui-patch.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 72c9749..bb39294 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -11,7 +11,7 @@
11#include "html.h" 11#include "html.h"
12#include "ui-shared.h" 12#include "ui-shared.h"
13 13
14void cgit_print_patch(char *hex, const char *prefix) 14void cgit_print_patch(char *hex, const char *old_rev, const char *prefix)
15{ 15{
16 struct rev_info rev; 16 struct rev_info rev;
17 struct commit *commit; 17 struct commit *commit;
@@ -33,16 +33,29 @@ void cgit_print_patch(char *hex, const char *prefix)
33 return; 33 return;
34 } 34 }
35 35
36 if (commit->parents && commit->parents->item) { 36 if (old_rev) {
37 if (get_sha1(old_rev, old_sha1)) {
38 cgit_print_error("Bad object id: %s", old_rev);
39 return;
40 }
41 if (!lookup_commit_reference(old_sha1)) {
42 cgit_print_error("Bad commit reference: %s", old_rev);
43 return;
44 }
45 } else if (commit->parents && commit->parents->item) {
37 hashcpy(old_sha1, commit->parents->item->object.sha1); 46 hashcpy(old_sha1, commit->parents->item->object.sha1);
38 sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
39 sha1_to_hex(sha1));
40 } else { 47 } else {
41 hashclr(old_sha1); 48 hashclr(old_sha1);
49 }
50
51 if (is_null_sha1(old_sha1)) {
42 memcpy(rev_range, sha1_to_hex(sha1), 41); 52 memcpy(rev_range, sha1_to_hex(sha1), 41);
53 } else {
54 sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
55 sha1_to_hex(sha1));
43 } 56 }
44 57
45 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 58 patchname = fmt("%s.patch", rev_range);
46 ctx.page.mimetype = "text/plain"; 59 ctx.page.mimetype = "text/plain";
47 ctx.page.filename = patchname; 60 ctx.page.filename = patchname;
48 cgit_print_http_headers(&ctx); 61 cgit_print_http_headers(&ctx);