summaryrefslogtreecommitdiff
path: root/pkg/git/gen.lua
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2021-01-07 15:10:02 -0800
committerMichael Forney <mforney@mforney.org>2021-01-07 23:08:29 -0800
commit92131b32c3ad420c254def43f3016c4c806838b3 (patch)
tree97167031935ccf58fbe1d3ede9e86ad9aef7e528 /pkg/git/gen.lua
parent0d868eacaca4c2a920f5eff5cebe4d41aa6ad7fe (diff)
git: Update to 2.30.0
Diffstat (limited to 'pkg/git/gen.lua')
-rw-r--r--pkg/git/gen.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 7e275205..1b6deb5c 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -125,6 +125,8 @@ lib('libgit.a', [[
mem-pool.c
merge.c
merge-blobs.c
+ merge-ort.c
+ merge-ort-wrappers.c
merge-recursive.c
mergesort.c
midx.c
@@ -203,6 +205,7 @@ lib('libgit.a', [[
strbuf.c
streaming.c
string-list.c
+ strmap.c
strvec.c
sub-process.c
submodule-config.c
@@ -319,6 +322,7 @@ local builtins = {
'fetch',
'fmt-merge-msg',
'for-each-ref',
+ 'for-each-repo',
'fsck',
'gc',
'get-tar-commit-id',
@@ -436,7 +440,6 @@ local scripts = {
-- src/Makefile:/^SCRIPT_LIB.\+=
{'mergetool--lib', '644'},
- {'parse-remote', '644'},
{'rebase--preserve-merges', '644'},
{'sh-i18n', '644'},
{'sh-setup', '644'},