diff options
| author | Lars Hjemli | 2009-09-13 21:56:45 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2009-09-13 21:56:45 +0200 |
| commit | 45c49d6cf4b819385dfee620a81e3cb095ed5cd1 (patch) | |
| tree | 8b9d8543bd3d9584bd81e4b03c6841afc29e9088 | |
| parent | Merge branch 'stable' (diff) | |
| download | cgit-45c49d6cf4b819385dfee620a81e3cb095ed5cd1.tar.gz cgit-45c49d6cf4b819385dfee620a81e3cb095ed5cd1.zip | |
Use GIT-1.6.4.3
Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | ui-commit.c | 2 | ||||
| -rw-r--r-- | ui-log.c | 2 |
4 files changed, 3 insertions, 3 deletions
| diff --git a/Makefile b/Makefile index 1f9893a..dc9dffd 100644 --- a/Makefile +++ b/Makefile | |||
| @@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | |||
| 5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
| 6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
| 7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
| 8 | GIT_VER = 1.6.3.4 | 8 | GIT_VER = 1.6.4.3 |
| 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
| 10 | INSTALL = install | 10 | INSTALL = install |
| 11 | 11 | ||
| diff --git a/git b/git | |||
| Subproject e276f018f2c1f0fc962fbe44a36708d1cdebada | Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c | ||
| diff --git a/ui-commit.c b/ui-commit.c index d6b73ee..f5b0ae5 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
| @@ -35,7 +35,7 @@ void cgit_print_commit(char *hex) | |||
| 35 | } | 35 | } |
| 36 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
| 37 | 37 | ||
| 38 | load_ref_decorations(); | 38 | load_ref_decorations(DECORATE_FULL_REFS); |
| 39 | 39 | ||
| 40 | html("<table summary='commit info' class='commit-info'>\n"); | 40 | html("<table summary='commit info' class='commit-info'>\n"); |
| 41 | html("<tr><th>author</th><td>"); | 41 | html("<tr><th>author</th><td>"); |
| diff --git a/ui-log.c b/ui-log.c index 0b37785..f3132c9 100644 --- a/ui-log.c +++ b/ui-log.c | |||
| @@ -161,7 +161,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
| 161 | rev.verbose_header = 1; | 161 | rev.verbose_header = 1; |
| 162 | rev.show_root_diff = 0; | 162 | rev.show_root_diff = 0; |
| 163 | setup_revisions(argc, argv, &rev, NULL); | 163 | setup_revisions(argc, argv, &rev, NULL); |
| 164 | load_ref_decorations(); | 164 | load_ref_decorations(DECORATE_FULL_REFS); |
| 165 | rev.show_decorations = 1; | 165 | rev.show_decorations = 1; |
| 166 | rev.grep_filter.regflags |= REG_ICASE; | 166 | rev.grep_filter.regflags |= REG_ICASE; |
| 167 | compile_grep_patterns(&rev.grep_filter); | 167 | compile_grep_patterns(&rev.grep_filter); |