summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-commit.c3
-rw-r--r--ui-log.c6
4 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 83d4716..59edab0 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.12.4
+GIT_VER = 1.8.2.1
GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
INSTALL = install
MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
-Subproject 7e2010537e96d0a1144520222f20ba1dc3d6144
+Subproject 5bda18c186e455f8e65f976d3bf333ab1f4b5b5
diff --git a/ui-commit.c b/ui-commit.c
index 0783285..5a552a1 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -36,7 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
}
info = cgit_parse_commit(commit);
- format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
+ init_display_notes(NULL);
+ format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
load_ref_decorations(DECORATE_FULL_REFS);
diff --git a/ui-log.c b/ui-log.c
index aaffb4e..8d8b235 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -195,9 +195,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_addstr(&msgbuf, info->msg);
strbuf_addch(&msgbuf, '\n');
}
- format_note(NULL, commit->object.sha1, &msgbuf,
- PAGE_ENCODING,
- NOTES_SHOW_HEADER | NOTES_INDENT);
+ format_display_notes(commit->object.sha1,
+ &msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
}
@@ -397,6 +396,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
commit->parents = NULL;
}
+ init_display_notes(NULL);
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
print_commit(commit, &rev);
free(commit->buffer);
© 'Necoro' Neumann3-5/+5 2020-05-10Text part in emailsRenĂ© 'Necoro' Neumann7-33/+115 2020-05-10Allow options on group level.RenĂ© 'Necoro' Neumann3-5/+11 2020-05-10Renamed feed template to html templateRenĂ© 'Necoro' Neumann2-2/+2 2020-05-10Release v0.2.0v0.2.0RenĂ© 'Necoro' Neumann2-2/+6 2020-05-10Fix building cacheRenĂ© 'Necoro' Neumann1-1/+3 2020-05-10Update READMERenĂ© 'Necoro' Neumann1-5/+44 2020-05-10Ignore 'dist' folder and build productsRenĂ© 'Necoro' Neumann1-0/+2 2020-05-08Print item hashes in debug modeRenĂ© 'Necoro' Neumann1-1/+7 2020-05-07Improve html renderingRenĂ© 'Necoro' Neumann2-53/+32 2020-05-07Do not assume items to be new when their published date is newer than the las...RenĂ© 'Necoro' Neumann2-7/+1 2020-05-07Updating some depsRenĂ© 'Necoro' Neumann2-2/+7 2020-05-07Better detection if a text starts with html or notRenĂ© 'Necoro' Neumann2-4/+13 2020-05-07go fmtRenĂ© 'Necoro' Neumann1-3/+2 2020-05-07Add header X-Feed2Imap-GUIDRenĂ© 'Necoro' Neumann3-1/+7 2020-05-07update changelogRenĂ© 'Necoro' Neumann1-0/+1 2020-05-07FixRenĂ© 'Necoro' Neumann1-1/+1 2020-05-07Unified publishedDate and updatedDate into one (just as the old feed2imap...)RenĂ© 'Necoro' Neumann5-21/+32 2020-05-06Print version during startupRenĂ© 'Necoro' Neumann1-1/+1 2020-05-06Improve templateRenĂ© 'Necoro' Neumann3-20/+28 2020-05-05Fix pipelineRenĂ© 'Necoro' Neumann1-2/+5 2020-05-05Make changelog a part of the release pipeline (untested)RenĂ© 'Necoro' Neumann2-0/+12