diff options
| author | Christian Hesse | 2017-11-29 22:25:42 +0100 |
|---|---|---|
| committer | Christian Hesse | 2017-12-06 20:29:10 +0100 |
| commit | 5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c (patch) | |
| tree | dfae2c36534214d513607fcc4beceaa1c7657256 | |
| parent | global: spelling fixes (diff) | |
| download | cgit-5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c.tar.gz cgit-5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c.zip | |
git: update to v2.15.1
Update to git version v2.15.1: With commit 0abe14f6 prepare_packed_git() moved to packfile.[ch]. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | ui-clone.c | 1 |
3 files changed, 2 insertions, 1 deletions
| diff --git a/Makefile b/Makefile index f3ee84c..274f37e 100644 --- a/Makefile +++ b/Makefile | |||
| @@ -14,7 +14,7 @@ htmldir = $(docdir) | |||
| 14 | pdfdir = $(docdir) | 14 | pdfdir = $(docdir) |
| 15 | mandir = $(prefix)/share/man | 15 | mandir = $(prefix)/share/man |
| 16 | SHA1_HEADER = <openssl/sha.h> | 16 | SHA1_HEADER = <openssl/sha.h> |
| 17 | GIT_VER = 2.14.0 | 17 | GIT_VER = 2.15.1 |
| 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz | 18 | GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz |
| 19 | INSTALL = install | 19 | INSTALL = install |
| 20 | COPYTREE = cp -r | 20 | COPYTREE = cp -r |
| diff --git a/git b/git | |||
| Subproject 4384e3cde2ce8ecd194202e171ae16333d24132 | Subproject 9b185bef0c15cec1ea8753ce091e42ea041f2c3 | ||
| diff --git a/ui-clone.c b/ui-clone.c index 0d11672..bc98980 100644 --- a/ui-clone.c +++ b/ui-clone.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "ui-clone.h" | 11 | #include "ui-clone.h" |
| 12 | #include "html.h" | 12 | #include "html.h" |
| 13 | #include "ui-shared.h" | 13 | #include "ui-shared.h" |
| 14 | #include "packfile.h" | ||
| 14 | 15 | ||
| 15 | static int print_ref_info(const char *refname, const struct object_id *oid, | 16 | static int print_ref_info(const char *refname, const struct object_id *oid, |
| 16 | int flags, void *cb_data) | 17 | int flags, void *cb_data) |