diff options
author | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
commit | 6c66430e9658616e118d10af9c9ab48858a04e67 (patch) | |
tree | 2e83a411ed158f151df085c7f3836827753aecf7 /ui-patch.c | |
parent | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (diff) | |
parent | fa146ccabdd0de746a7076f0630af550e43d9088 (diff) | |
download | cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.gz cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.xz |
Merge tag 'v1.2.2' into local
CGIT v1.2.2
Diffstat (limited to 'ui-patch.c')
-rw-r--r-- | ui-patch.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -11,13 +11,16 @@ #include "html.h" #include "ui-shared.h" +/* two commit hashes with two dots in between and termination */ +#define REV_RANGE_LEN 2 * GIT_MAX_HEXSZ + 3 + void cgit_print_patch(const char *new_rev, const char *old_rev, const char *prefix) { struct rev_info rev; struct commit *commit; struct object_id new_rev_oid, old_rev_oid; - char rev_range[2 * 40 + 3]; + char rev_range[REV_RANGE_LEN]; const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL }; int rev_argc = ARRAY_SIZE(rev_argv) - 1; char *patchname; @@ -33,7 +36,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev, "Bad object id: %s", new_rev); return; } - commit = lookup_commit_reference(&new_rev_oid); + commit = lookup_commit_reference(the_repository, &new_rev_oid); if (!commit) { cgit_print_error_page(404, "Not found", "Bad commit reference: %s", new_rev); @@ -46,7 +49,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev, "Bad object id: %s", old_rev); return; } - if (!lookup_commit_reference(&old_rev_oid)) { + if (!lookup_commit_reference(the_repository, &old_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad commit reference: %s", old_rev); return; @@ -60,7 +63,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev, if (is_null_oid(&old_rev_oid)) { memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1); } else { - sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid), + xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid), oid_to_hex(&new_rev_oid)); } |