diff options
| author | Michael Forney <mforney@mforney.org> | 2016-10-12 17:43:54 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-10-12 18:23:27 -0700 |
| commit | 21b197881fdf8393917eef3487e65caa19f8a742 (patch) | |
| tree | 3ee480932c2e102332a1dcdc8d9084c438279b45 /core/git | |
| parent | 4c47091251d4afa7fa46c65601b4e00b89850b74 (diff) | |
git: Update to 2.10.1
Diffstat (limited to 'core/git')
| -rw-r--r-- | core/git/config.h | 2 | ||||
| -rw-r--r-- | core/git/gen.rc | 3 | ||||
| -rw-r--r-- | core/git/rev | 2 | ||||
| m--------- | core/git/src | 0 |
4 files changed, 5 insertions, 2 deletions
diff --git a/core/git/config.h b/core/git/config.h index a2c743b6..6376e43d 100644 --- a/core/git/config.h +++ b/core/git/config.h @@ -7,7 +7,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.10.0" +#define GIT_VERSION "2.10.1" #define NO_SYS_POLL_H #define PAGER_ENV "LESS=FRX LV=-c" #define SHA1_HEADER <openssl/sha.h> diff --git a/core/git/gen.rc b/core/git/gen.rc index ac8d5d41..83f82776 100644 --- a/core/git/gen.rc +++ b/core/git/gen.rc @@ -4,6 +4,7 @@ cflags\ -I '$builddir'/core/libressl/include\ -I '$builddir'/core/curl/include\ -I '$srcdir' \ + -I '$srcdir'/compat/regex\ -I '$outdir' rule cmdlist 'oldcwd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$oldcwd/$in >$$oldcwd/$out.tmp && mv $$oldcwd/$out.tmp $$oldcwd/$out' @@ -16,6 +17,7 @@ deps=(\ cc exec_cmd.c '||' $deps ; with cflags '$cflags ''-DPREFIX=""''' cc common-main.c '||' $deps +cc compat/regex/regex.c '||' $deps ; with cflags '$cflags -DGAWK -DNO_MBSUPPORT' # src/Makefile:/^LIB_OBJS.\+= lib libgit.a -d $"deps\ @@ -40,6 +42,7 @@ lib libgit.a -d $"deps\ combine-diff.c\ commit.c\ compat/obstack.c\ + compat/regex/regex.c.o\ compat/terminal.c\ config.c\ connect.c\ diff --git a/core/git/rev b/core/git/rev index b8626c4c..7ed6ff82 100644 --- a/core/git/rev +++ b/core/git/rev @@ -1 +1 @@ -4 +5 diff --git a/core/git/src b/core/git/src -Subproject 6ebdac1bab966b720d776aa43ca188fe378b1f4 +Subproject 6406bdc0b95715a087fdeeb0f6adf3deb80a25b |