On Wed, Aug 09, 2017 at 07:02:56PM -0500, Jeff Smith wrote: > Numerous changes were made to git functions to use an object_id > structure rather than sending sha1 hashes as raw unsigned character > arrays. The functions that affect cgit are: parse_object, > lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect, > diff_root_tree_sha1, diff_tree_sha1, and format_display_notes. > > Commit b2141fc (config: don't include config.h by default) made it > necessary to that config.h be explicitly included when needed. > > Commit 07a3d41 (grep: remove regflags from the public grep_opt API) > removed one way of specifying the ignore-case grep option. > > Signed-off-by: Jeff Smith <whydo...@gmail.com> > --- > Makefile | 2 +- > git | 2 +- > scan-tree.c | 5 +++-- > shared.c | 6 +++--- > ui-blob.c | 6 +++--- > ui-clone.c | 2 +- > ui-commit.c | 6 +++--- > ui-diff.c | 18 +++++++++--------- > ui-log.c | 10 +++++----- > ui-patch.c | 4 ++-- > ui-plain.c | 2 +- > ui-snapshot.c | 2 +- > ui-tag.c | 4 ++-- > ui-tree.c | 18 +++++++++--------- > 14 files changed, 44 insertions(+), 43 deletions(-) > > diff --git a/Makefile b/Makefile > index 3d792ce..f3ee84c 100644 > --- a/Makefile > +++ b/Makefile > @@ -14,7 +14,7 @@ htmldir = $(docdir) > pdfdir = $(docdir) > mandir = $(prefix)/share/man > SHA1_HEADER = <openssl/sha.h> > -GIT_VER = 2.13.4 > +GIT_VER = 2.14.0 > GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz > INSTALL = install > COPYTREE = cp -r > diff --git a/git b/git > index cf8899d..4384e3c 160000 > --- a/git > +++ b/git > @@ -1 +1 @@ > -Subproject commit cf8899d285d2648013040ec7196ffd3de0606664 > +Subproject commit 4384e3cde2ce8ecd194202e171ae16333d241326 > diff --git a/scan-tree.c b/scan-tree.c > index 08f3f1d..c8d175e 100644 > --- a/scan-tree.c > +++ b/scan-tree.c > @@ -10,6 +10,7 @@ > #include "scan-tree.h" > #include "configfile.h" > #include "html.h" > +#include "config.h"
We normally include Git headers with <>, and in fact they're all in cgit.h. I'm not sure whether it's better to add config.h to the list in cgit.h or keep it here, but I do think it should be distinguished from CGit headers by using <> and probably separating it a bit. The rest of the patch looks good to me. _______________________________________________ CGit mailing list CGit@lists.zx2c4.com https://lists.zx2c4.com/mailman/listinfo/cgit
