]> granicus.if.org Git - cgit/commitdiff
Merge branch 'lh/cleanup'
authorLars Hjemli <hjemli@gmail.com>
Tue, 8 Apr 2008 19:29:21 +0000 (21:29 +0200)
committerLars Hjemli <hjemli@gmail.com>
Tue, 8 Apr 2008 19:29:21 +0000 (21:29 +0200)
* lh/cleanup: (21 commits)
  Reset ctx.repo to NULL when the config parser is finished
  Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
  Move function for configfile parsing into configfile.[ch]
  Add cache.h
  Remove global and obsolete cgit_cmd
  Makefile: copy the QUIET constructs from the Makefile in git.git
  Move cgit_version from shared.c to cgit.c
  Makefile: autobuild dependency rules
  Initial Makefile cleanup
  Move non-generic functions from shared.c to cgit.c
  Add ui-shared.h
  Add separate header-files for each page/view
  Refactor snapshot support
  Add command dispatcher
  Remove obsolete cacheitem parameter to ui-functions
  Add struct cgit_page to cgit_context
  Introduce html.h
  Improve initialization of git directory
  Move cgit_repo into cgit_context
  Add all config variables into struct cgit_context
  ...

1  2 
Makefile
html.c
ui-patch.c

diff --cc Makefile
Simple merge
diff --cc html.c
Simple merge
diff --cc ui-patch.c
index 7ee2c416ee3825630b0c7014b12a99020555a0b5,36bfae4836df393cd1c24c94b58e15702e2bc134..c1c4ce30368d668b954d460a4df3b836da58db4f
@@@ -88,14 -90,12 +90,16 @@@ void cgit_print_patch(char *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);
+       ctx.page.mimetype = "text/plain";
+       ctx.page.filename = patchname;
+       cgit_print_http_headers(&ctx);
        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: ");