diff options
| author | Michael Forney <mforney@mforney.org> | 2021-12-02 14:01:37 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-12-22 00:15:18 -0800 |
| commit | 63ab9afa40aeeefea935067cbe6b1e4dbdaa92c8 (patch) | |
| tree | 80439f5b20b9744cc65aaba9a05f0cdc2198f193 | |
| parent | 0636ca1f43ed8ba774751b49802693ba6af76bc7 (diff) | |
git: Update to 2.34.1
| -rw-r--r-- | pkg/git/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/git/config.h | 2 | ||||
| -rw-r--r-- | pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch | 4 | ||||
| -rw-r--r-- | pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch | 4 | ||||
| -rw-r--r-- | pkg/git/sha256 | 2 | ||||
| m--------- | pkg/git/src | 0 | ||||
| -rw-r--r-- | pkg/git/url | 2 | ||||
| -rw-r--r-- | pkg/git/ver | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index cb4cde0d..18cca0fc 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.34.0.tar.gz +/git-manpages-2.34.1.tar.gz /man /man.ninja diff --git a/pkg/git/config.h b/pkg/git/config.h index d1c9b9ee..75ea1e75 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -11,7 +11,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.34.0" +#define GIT_VERSION "2.34.1" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY diff --git a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch b/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch index c5af828d..d482f774 100644 --- a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch +++ b/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch @@ -1,4 +1,4 @@ -From dfb7c96e207a1c6d298d417c2e0b8fd79821d8d3 Mon Sep 17 00:00:00 2001 +From 2dd5d11805fc486ea2d6b83cba568a1282b45286 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 27 Jun 2020 01:09:58 -0700 Subject: [PATCH] Enable add.interactive.usebuiltin by default @@ -20,5 +20,5 @@ index ef6b619c45..c2b326abfd 100644 &use_builtin_add_i)) ; /* ok */ -- -2.32.0 +2.34.0 diff --git a/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch b/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch index 93721296..1ad01d3c 100644 --- a/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch +++ b/pkg/git/patch/0002-request-pull-use-awk-instead-of-perl-to-parse-ls-rem.patch @@ -1,4 +1,4 @@ -From 7cb4481678c7cffd129b85e39c5a080055587372 Mon Sep 17 00:00:00 2001 +From 1b87b640fac0fa52de5da8d2c57d038cc0cef5b1 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 16 Mar 2021 17:21:31 -0700 Subject: [PATCH] request-pull: use awk instead of perl to parse ls-remote @@ -80,5 +80,5 @@ index 2d0e44656c..0e3cf644e0 100755 ref=$3 -- -2.30.1 +2.34.0 diff --git a/pkg/git/sha256 b/pkg/git/sha256 index 461d429b..a666e7c8 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -fe66a69244def488306c3e05c1362ea53d8626d2a7e57cd7311df2dab1ef8356 git-manpages-2.34.0.tar.gz +220f1ed68582caeddf79c4db15e4eaa4808ec01fd11889e19232f0a74d7f31b0 git-manpages-2.34.1.tar.gz diff --git a/pkg/git/src b/pkg/git/src -Subproject cd3e606211bb1cf8bc57f7d76bab98cc17a150b +Subproject e9d7761bb94f20acc98824275e317fa82436c25 diff --git a/pkg/git/url b/pkg/git/url index 72cfee46..04f1df1c 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.0.tar.gz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.1.tar.gz" diff --git a/pkg/git/ver b/pkg/git/ver index 468dad23..17556a9b 100644 --- a/pkg/git/ver +++ b/pkg/git/ver @@ -1 +1 @@ -2.34.0 r0 +2.34.1 r0 |