author | Lars Hjemli <hjemli@gmail.com> | 2008-03-17 22:13:16 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-17 22:51:47 (UTC) |
commit | e01f1403b9b501c563b1fe0e0052460a95945528 (patch) (side-by-side diff) | |
tree | eff9fd11272714db70bf2ac7116511f03d800af6 | |
parent | 0537a7d1cfdf7934d91798a623030fd454b356af (diff) | |
download | cgit-e01f1403b9b501c563b1fe0e0052460a95945528.zip cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.gz cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.bz2 |
Fix segfault in patch view for root commit
The code for patch view assumed the current commit would always have a parent,
which made cgit segfault when that wasn't the case.
This fixes the bug and adds a test-script for patch view which includes a test
for the inital commit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0108-patch.sh | 37 | ||||
-rw-r--r-- | ui-patch.c | 4 |
2 files changed, 41 insertions, 0 deletions
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh new file mode 100755 index 0000000..33351d6 --- a/dev/null +++ b/tests/t0108-patch.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on patch page" + +run_test 'generate foo/patch' ' + cgit_query "url=foo/patch" >trash/tmp +' + +run_test 'find `From:` line' ' + grep -e "^From: " trash/tmp +' + +run_test 'find `Date:` line' ' + grep -e "^Date: " trash/tmp +' + +run_test 'find `Subject:` line' ' + grep -e "^Subject: commit 5" trash/tmp +' + +run_test 'find `cgit` signature' ' + tail -1 trash/tmp | grep -e "^cgit" +' + +run_test 'find initial commit' ' + root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) +' + +run_test 'generate patch for initial commit' ' + cgit_query "url=foo/patch&id=$root" >trash/tmp +' + +run_test 'find `cgit` signature' ' + tail -1 trash/tmp | grep -e "^cgit" +' @@ -88,7 +88,11 @@ void cgit_print_patch(char *hex, struct cacheitem *item) return; } info = cgit_parse_commit(commit); + + if (commit->parents && commit->parents->item) hashcpy(old_sha1, commit->parents->item->object.sha1); + else + hashclr(old_sha1); patchname = fmt("%s.patch", sha1_to_hex(sha1)); cgit_print_snapshot_start("text/plain", patchname, item); |