diff options
| author | Michael Forney <mforney@mforney.org> | 2018-09-29 18:28:10 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2018-09-29 18:28:10 -0700 |
| commit | 5256901212b062ac7d6f8d53fc6f0700671a41a9 (patch) | |
| tree | 39f51e425670d5923fa847e2861f3d8682aa4dd5 /pkg | |
| parent | 2f54f77fe7a22b3257d70646f24ed5f84efdd2e7 (diff) | |
git: Update to 2.19.0
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/git/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/git/commands.txt | 32 | ||||
| -rw-r--r-- | pkg/git/config.h | 2 | ||||
| -rw-r--r-- | pkg/git/gen.lua | 10 | ||||
| -rw-r--r-- | pkg/git/man.txt | 3 | ||||
| -rw-r--r-- | pkg/git/rev | 2 | ||||
| -rw-r--r-- | pkg/git/sha256 | 2 | ||||
| m--------- | pkg/git/src | 0 | ||||
| -rw-r--r-- | pkg/git/url | 2 |
9 files changed, 47 insertions, 8 deletions
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index 52ebcead..ceb02067 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.18.0.tar.xz +/git-manpages-2.19.0.tar.xz /man /man.ninja diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt index 79c759eb..089d322f 100644 --- a/pkg/git/commands.txt +++ b/pkg/git/commands.txt @@ -1,4 +1,4 @@ -# 2,<cd src/Documentation && printf '%s\n' git-*.txt +# 2,<cd src/Documentation && printf '%s\n' git*.txt *config.txt git-add.txt git-am.txt git-annotate.txt @@ -97,6 +97,7 @@ git-prune.txt git-pull.txt git-push.txt git-quiltimport.txt +git-range-diff.txt git-read-tree.txt git-rebase.txt git-receive-pack.txt @@ -149,3 +150,32 @@ git-web--browse.txt git-whatchanged.txt git-worktree.txt git-write-tree.txt +git.txt +gitattributes.txt +gitcli.txt +gitcore-tutorial.txt +gitcredentials.txt +gitcvs-migration.txt +gitdiffcore.txt +giteveryday.txt +gitglossary.txt +githooks.txt +gitignore.txt +gitk.txt +gitmodules.txt +gitnamespaces.txt +gitremote-helpers.txt +gitrepository-layout.txt +gitrevisions.txt +gitsubmodules.txt +gittutorial-2.txt +gittutorial.txt +gitweb.conf.txt +gitweb.txt +gitworkflows.txt +config.txt +diff-config.txt +fmt-merge-msg-config.txt +git-config.txt +merge-config.txt +rebase-config.txt diff --git a/pkg/git/config.h b/pkg/git/config.h index ebff97fc..7c57c392 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.18.0" +#define GIT_VERSION "2.19.0" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua index c40a9b9e..6c5890fb 100644 --- a/pkg/git/gen.lua +++ b/pkg/git/gen.lua @@ -79,6 +79,7 @@ lib('libgit.a', [[ ewah/ewah_io.c ewah/ewah_rlw.c exec-cmd.c.o + fetch-negotiator.c fetch-object.c fetch-pack.c fsck.c @@ -88,9 +89,11 @@ lib('libgit.a', [[ graph.c grep.c hashmap.c + linear-assignment.c help.c hex.c ident.c + json-writer.c kwset.c levenshtein.c line-log.c @@ -111,6 +114,8 @@ lib('libgit.a', [[ merge.c mergesort.c name-hash.c + negotiator/default.c + negotiator/skipping.c notes-cache.c notes-merge.c notes-utils.c @@ -140,6 +145,7 @@ lib('libgit.a', [[ prompt.c protocol.c quote.c + range-diff.c reachable.c read-cache.c ref-filter.c @@ -300,6 +306,7 @@ local builtins = { 'prune', 'pull', 'push', + 'range-diff', 'read-tree', 'rebase--helper', 'receive-pack', @@ -319,6 +326,7 @@ local builtins = { 'serve', 'shortlog', 'show-branch', + 'show-index', 'show-ref', 'stripspace', 'submodule--helper', @@ -370,7 +378,6 @@ x('http-backend') x('imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/curl/libcurl.a.d'}) x('sh-i18n--envsubst') x('shell') -x('show-index') -- git-remote-testsvn is intentionally omitted. x('remote-http', {'remote-curl.c', 'http.c.o', 'http-walker.c', '$builddir/pkg/curl/libcurl.a.d'}) @@ -405,6 +412,7 @@ x('mergetool--lib', '644') x('parse-remote', '644') x('rebase--am', '644') x('rebase--interactive', '644') +x('rebase--preserve-merges', '644') x('rebase--merge', '644') x('sh-setup', '644') x('sh-i18n', '644') diff --git a/pkg/git/man.txt b/pkg/git/man.txt index f00526f4..e5cde24b 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -1,4 +1,4 @@ -# 2,<xzcat git-manpages-2.18.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort +# 2,<xzcat git-manpages-2.19.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort man1/git-add.1 man1/git-am.1 man1/git-annotate.1 @@ -96,6 +96,7 @@ man1/git-prune.1 man1/git-pull.1 man1/git-push.1 man1/git-quiltimport.1 +man1/git-range-diff.1 man1/git-read-tree.1 man1/git-rebase.1 man1/git-receive-pack.1 diff --git a/pkg/git/rev b/pkg/git/rev index e85087af..f5c89552 100644 --- a/pkg/git/rev +++ b/pkg/git/rev @@ -1 +1 @@ -31 +32 diff --git a/pkg/git/sha256 b/pkg/git/sha256 index d9b2835c..adfb697a 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -9ae3be95e63379597164c79c9018e84b7ef6964da923e5689dbc307693266096 git-manpages-2.18.0.tar.xz +4e51041b9636a1fdd8887091d1cca8b0cc6af3f1761870edd091e074378e7dcb git-manpages-2.19.0.tar.xz diff --git a/pkg/git/src b/pkg/git/src -Subproject 53f9a3e157dbbc901a02ac2c73346d375e24978 +Subproject 1d4361b0f344188ab5eec6dcea01f61a3a3a167 diff --git a/pkg/git/url b/pkg/git/url index a29ec751..5536d469 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.18.0.tar.xz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.19.0.tar.xz" |
