about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-03-17 23:13:16 +0100
committerLars Hjemli2008-03-17 23:51:47 +0100
commite01f1403b9b501c563b1fe0e0052460a95945528 (patch)
treeeff9fd11272714db70bf2ac7116511f03d800af6
parentUse GIT-1.5.4.4 (diff)
downloadcgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.gz
cgit-e01f1403b9b501c563b1fe0e0052460a95945528.zip
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-xtests/t0108-patch.sh37
-rw-r--r--ui-patch.c6
2 files changed, 42 insertions, 1 deletions
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh new file mode 100755 index 0000000..33351d6 --- /dev/null +++ b/tests/t0108-patch.sh
@@ -0,0 +1,37 @@
1#!/bin/sh
2
3. ./setup.sh
4
5prepare_tests "Check content on patch page"
6
7run_test 'generate foo/patch' '
8 cgit_query "url=foo/patch" >trash/tmp
9'
10
11run_test 'find `From:` line' '
12 grep -e "^From: " trash/tmp
13'
14
15run_test 'find `Date:` line' '
16 grep -e "^Date: " trash/tmp
17'
18
19run_test 'find `Subject:` line' '
20 grep -e "^Subject: commit 5" trash/tmp
21'
22
23run_test 'find `cgit` signature' '
24 tail -1 trash/tmp | grep -e "^cgit"
25'
26
27run_test 'find initial commit' '
28 root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1)
29'
30
31run_test 'generate patch for initial commit' '
32 cgit_query "url=foo/patch&id=$root" >trash/tmp
33'
34
35run_test 'find `cgit` signature' '
36 tail -1 trash/tmp | grep -e "^cgit"
37'
diff --git a/ui-patch.c b/ui-patch.c index e7a010a..7ee2c41 100644 --- a/ui-patch.c +++ b/ui-patch.c
@@ -88,7 +88,11 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
88 return; 88 return;
89 } 89 }
90 info = cgit_parse_commit(commit); 90 info = cgit_parse_commit(commit);
91 hashcpy(old_sha1, commit->parents->item->object.sha1); 91
92 if (commit->parents && commit->parents->item)
93 hashcpy(old_sha1, commit->parents->item->object.sha1);
94 else
95 hashclr(old_sha1);
92 96
93 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 97 patchname = fmt("%s.patch", sha1_to_hex(sha1));
94 cgit_print_snapshot_start("text/plain", patchname, item); 98 cgit_print_snapshot_start("text/plain", patchname, item);