summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-log.c6
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2fe537e..9896b4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,31 @@
1CGIT_VERSION = v0.7.2 1CGIT_VERSION = v0.7.2
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.6.0.1 7GIT_VER = 1.6.0.2
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
11# Let the user override the above settings. 11# Let the user override the above settings.
12# 12#
13-include cgit.conf 13-include cgit.conf
14 14
15# 15#
16# Define a way to invoke make in subdirs quietly, shamelessly ripped 16# Define a way to invoke make in subdirs quietly, shamelessly ripped
17# from git.git 17# from git.git
18# 18#
19QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir 19QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
20QUIET_SUBDIR1 = 20QUIET_SUBDIR1 =
21 21
22ifneq ($(findstring $(MAKEFLAGS),w),w) 22ifneq ($(findstring $(MAKEFLAGS),w),w)
23PRINT_DIR = --no-print-directory 23PRINT_DIR = --no-print-directory
24else # "make -w" 24else # "make -w"
25NO_SUBDIR = : 25NO_SUBDIR = :
26endif 26endif
27 27
28ifndef V 28ifndef V
29 QUIET_CC = @echo ' ' CC $@; 29 QUIET_CC = @echo ' ' CC $@;
30 QUIET_MM = @echo ' ' MM $@; 30 QUIET_MM = @echo ' ' MM $@;
31 QUIET_SUBDIR0 = +@subdir= 31 QUIET_SUBDIR0 = +@subdir=
diff --git a/git b/git
Subproject 5760a6b094736e6f59eb32c7abb4cdbb7fca162 Subproject 97a7a82f199f165f85fe39a3c318b18c621e633
diff --git a/ui-log.c b/ui-log.c
index 746f40b..8dd8b89 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -71,52 +71,50 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
71 struct rev_info rev; 71 struct rev_info rev;
72 struct commit *commit; 72 struct commit *commit;
73 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 73 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
74 int argc = 2; 74 int argc = 2;
75 int i, columns = 3; 75 int i, columns = 3;
76 76
77 if (!tip) 77 if (!tip)
78 argv[1] = ctx.qry.head; 78 argv[1] = ctx.qry.head;
79 79
80 if (grep && pattern && (!strcmp(grep, "grep") || 80 if (grep && pattern && (!strcmp(grep, "grep") ||
81 !strcmp(grep, "author") || 81 !strcmp(grep, "author") ||
82 !strcmp(grep, "committer"))) 82 !strcmp(grep, "committer")))
83 argv[argc++] = fmt("--%s=%s", grep, pattern); 83 argv[argc++] = fmt("--%s=%s", grep, pattern);
84 84
85 if (path) { 85 if (path) {
86 argv[argc++] = "--"; 86 argv[argc++] = "--";
87 argv[argc++] = path; 87 argv[argc++] = path;
88 } 88 }
89 init_revisions(&rev, NULL); 89 init_revisions(&rev, NULL);
90 rev.abbrev = DEFAULT_ABBREV; 90 rev.abbrev = DEFAULT_ABBREV;
91 rev.commit_format = CMIT_FMT_DEFAULT; 91 rev.commit_format = CMIT_FMT_DEFAULT;
92 rev.verbose_header = 1; 92 rev.verbose_header = 1;
93 rev.show_root_diff = 0; 93 rev.show_root_diff = 0;
94 setup_revisions(argc, argv, &rev, NULL); 94 setup_revisions(argc, argv, &rev, NULL);
95 if (rev.grep_filter) { 95 rev.grep_filter.regflags |= REG_ICASE;
96 rev.grep_filter->regflags |= REG_ICASE; 96 compile_grep_patterns(&rev.grep_filter);
97 compile_grep_patterns(rev.grep_filter);
98 }
99 prepare_revision_walk(&rev); 97 prepare_revision_walk(&rev);
100 98
101 if (pager) 99 if (pager)
102 html("<table class='list nowrap'>"); 100 html("<table class='list nowrap'>");
103 101
104 html("<tr class='nohover'><th class='left'>Age</th>" 102 html("<tr class='nohover'><th class='left'>Age</th>"
105 "<th class='left'>Commit message</th>" 103 "<th class='left'>Commit message</th>"
106 "<th class='left'>Author</th>"); 104 "<th class='left'>Author</th>");
107 if (ctx.repo->enable_log_filecount) { 105 if (ctx.repo->enable_log_filecount) {
108 html("<th class='left'>Files</th>"); 106 html("<th class='left'>Files</th>");
109 columns++; 107 columns++;
110 if (ctx.repo->enable_log_linecount) { 108 if (ctx.repo->enable_log_linecount) {
111 html("<th class='left'>Lines</th>"); 109 html("<th class='left'>Lines</th>");
112 columns++; 110 columns++;
113 } 111 }
114 } 112 }
115 html("</tr>\n"); 113 html("</tr>\n");
116 114
117 if (ofs<0) 115 if (ofs<0)
118 ofs = 0; 116 ofs = 0;
119 117
120 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 118 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
121 free(commit->buffer); 119 free(commit->buffer);
122 commit->buffer = NULL; 120 commit->buffer = NULL;