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
--- 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"
+'
diff --git a/ui-patch.c b/ui-patch.c
index e7a010a..7ee2c41 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -43,68 +43,72 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                 htmlf("index %s..%s", abbrev1, abbrev2);
                 free(abbrev1);
                 free(abbrev2);
                 if (mode1 != 0 && mode2 != 0) {
                         htmlf(" %.6o", mode1);
                         if (mode2 != mode1)
                                 htmlf("..%.6o", mode2);
                 }
                 htmlf("\n--- a/%s\n", path1);
                 htmlf("+++ b/%s\n", path2);
         }
 }
 
 static void filepair_cb(struct diff_filepair *pair)
 {
         header(pair->one->sha1, pair->one->path, pair->one->mode,
                pair->two->sha1, pair->two->path, pair->two->mode);
         if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
                 if (S_ISGITLINK(pair->one->mode))
                         print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                 if (S_ISGITLINK(pair->two->mode))
                         print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                 return;
         }
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 html("Error running diff");
 }
 
 void cgit_print_patch(char *hex, struct cacheitem *item)
 {
         struct commit *commit;
         struct commitinfo *info;
         unsigned char sha1[20], old_sha1[20];
         char *patchname;
 
         if (!hex)
                 hex = cgit_query_head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
-        hashcpy(old_sha1, commit->parents->item->object.sha1);
+
+        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);
         htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
         htmlf("From: %s%s\n", info->author, info->author_email);
         html("Date: ");
         cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
         htmlf("Subject: %s\n\n", info->subject);
         if (info->msg && *info->msg) {
                 htmlf("%s", info->msg);
                 if (info->msg[strlen(info->msg) - 1] != '\n')
                         html("\n");
         }
         html("---\n");
         cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
         html("--\n");
         htmlf("cgit %s\n", CGIT_VERSION);
         cgit_free_commitinfo(info);
 }