commit: f0f4b6dc3de71c50b6e06a180e3d95f4111d13f0
parent 6e75fa7ed5a29422dab43a01cddd86e4b55bebcd
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 19 Oct 2020 17:43:14 -0700
git: Update to 2.29.0
Installation of links in git-core is now optional via
SKIP_DASHED_BUILT_INS, so we choose to skip them as well.
Diffstat:
12 files changed, 43 insertions(+), 217 deletions(-)
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.28.0.tar.gz
+/git-manpages-2.29.0.tar.gz
/man
/man.ninja
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
@@ -74,6 +74,7 @@ git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
+git-maintenance.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
diff --git 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.28.0"
+#define GIT_VERSION "2.29.0"
#define HAVE_ALLOCA_H
#define HAVE_PATHS_H
#define HAVE_DEV_TTY
diff --git a/pkg/git/configs.txt b/pkg/git/configs.txt
@@ -14,11 +14,13 @@ config/clean.txt
config/color.txt
config/column.txt
config/commit.txt
+config/commitgraph.txt
config/completion.txt
config/core.txt
config/credential.txt
config/diff.txt
config/difftool.txt
+config/extensions.txt
config/fastimport.txt
config/feature.txt
config/fetch.txt
@@ -44,6 +46,7 @@ config/interactive.txt
config/log.txt
config/mailinfo.txt
config/mailmap.txt
+config/maintenance.txt
config/man.txt
config/merge.txt
config/mergetool.txt
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
@@ -41,7 +41,6 @@ lib('libgit.a', [[
archive-tar.c
archive-zip.c
archive.c
- argv-array.c
attr.c
base85.c
bisect.c
@@ -107,7 +106,6 @@ lib('libgit.a', [[
help.c
hex.c
ident.c
- interdiff.c
json-writer.c
kwset.c
levenshtein.c
@@ -132,6 +130,7 @@ lib('libgit.a', [[
midx.c
name-hash.c
negotiator/default.c
+ negotiator/noop.c
negotiator/skipping.c
notes-cache.c
notes-merge.c
@@ -173,6 +172,7 @@ lib('libgit.a', [[
ref-filter.c
reflog-walk.c
refs.c
+ refs/debug.c
refs/files-backend.c
refs/iterator.c
refs/packed-backend.c
@@ -203,6 +203,7 @@ lib('libgit.a', [[
strbuf.c
streaming.c
string-list.c
+ strvec.c
sub-process.c
submodule-config.c
submodule.c
@@ -251,6 +252,8 @@ lib('libgit.a', [[
xdiff-interface.c
zlib.c
+ unix-socket.c
+
sha1dc_git.c
sha1dc/sha1.c
sha1dc/ubc_check.c
@@ -282,6 +285,7 @@ local builtins = {
'bisect--helper',
'blame',
'branch',
+ 'bugreport',
'bundle',
'cat-file',
'check-attr',
@@ -298,6 +302,9 @@ local builtins = {
'commit',
'config',
'count-objects',
+ 'credential-cache--daemon',
+ 'credential-cache',
+ 'credential-store',
'credential',
'describe',
'diff-files',
@@ -307,6 +314,7 @@ local builtins = {
'difftool',
'env--helper',
'fast-export',
+ 'fast-import',
'fetch-pack',
'fetch',
'fmt-merge-msg',
@@ -390,34 +398,12 @@ local builtins = {
}
exe('git', {'git.c', 'common-main.c.o', expand{'builtin/', builtins, '.c'}, 'libgit.a.d'})
file('bin/git', '755', '$outdir/git')
-local syms = {
- builtins,
- 'cherry',
- 'cherry-pick',
- 'format-patch',
- 'fsck-objects',
- 'init',
- 'merge-subtree',
- 'restore',
- 'show',
- 'stage',
- 'status',
- 'switch',
- 'whatchanged',
-}
-for name in iterstrings(syms) do
- sym('libexec/git-core/git-'..name, '../../bin/git')
-end
local programs = {
-- src/Makefile:/^PROGRAM_OBJS./+=
- {'bugreport'},
- {'credential-store'},
{'daemon'},
- {'fast-import'},
{'http-backend'},
{'imap-send', {'imap-send.c', 'http.c.o', '$builddir/pkg/curl/libcurl.a.d'}},
- -- git-remote-testsvn is intentionally omitted
{'sh-i18n--envsubst'},
{'shell'},
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
@@ -0,0 +1,24 @@
+From 998329082e2fa9452c817fe6be6bcc908c13e8a7 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
+
+---
+ builtin/add.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/builtin/add.c b/builtin/add.c
+index a825887c50..737ef23492 100644
+--- a/builtin/add.c
++++ b/builtin/add.c
+@@ -194,6 +194,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
+
+ if (use_builtin_add_i < 0) {
+ int experimental;
++ use_builtin_add_i = 1;
+ if (!git_config_get_bool("add.interactive.usebuiltin",
+ &use_builtin_add_i))
+ ; /* ok */
+--
+2.28.0
+
diff --git a/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch b/pkg/git/patch/0001-revision-use-repository-from-rev_info-when-parsing-c.patch
@@ -1,114 +0,0 @@
-From 212f02aeb196de20d91519e31af40b4170124143 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 21 Jun 2020 14:29:38 -0700
-Subject: [PATCH] revision: use repository from rev_info when parsing commits
-
-Since revision.c was the only user of the parse_commit_gently
-compatibility define, remove it from commit.h.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- commit.h | 1 -
- revision.c | 18 +++++++++---------
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/commit.h b/commit.h
-index e901538909..a740e0461c 100644
---- a/commit.h
-+++ b/commit.h
-@@ -95,7 +95,6 @@ static inline int parse_commit_no_graph(struct commit *commit)
-
- #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
- #define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
--#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
- #define parse_commit(item) repo_parse_commit(the_repository, item)
- #endif
-
-diff --git a/revision.c b/revision.c
-index 6aa7f4f567..74f66f79a0 100644
---- a/revision.c
-+++ b/revision.c
-@@ -439,7 +439,7 @@ static struct commit *handle_commit(struct rev_info *revs,
- if (object->type == OBJ_COMMIT) {
- struct commit *commit = (struct commit *)object;
-
-- if (parse_commit(commit) < 0)
-+ if (repo_parse_commit(revs->repo, commit) < 0)
- die("unable to parse commit %s", name);
- if (flags & UNINTERESTING) {
- mark_parents_uninteresting(commit);
-@@ -992,7 +992,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
- ts->treesame[0] = 1;
- }
- }
-- if (parse_commit(p) < 0)
-+ if (repo_parse_commit(revs->repo, p) < 0)
- die("cannot simplify commit %s (because of %s)",
- oid_to_hex(&commit->object.oid),
- oid_to_hex(&p->object.oid));
-@@ -1037,7 +1037,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
- * IOW, we pretend this parent is a
- * "root" commit.
- */
-- if (parse_commit(p) < 0)
-+ if (repo_parse_commit(revs->repo, p) < 0)
- die("cannot simplify commit %s (invalid %s)",
- oid_to_hex(&commit->object.oid),
- oid_to_hex(&p->object.oid));
-@@ -1105,7 +1105,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
- parent = parent->next;
- if (p)
- p->object.flags |= UNINTERESTING;
-- if (parse_commit_gently(p, 1) < 0)
-+ if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
- continue;
- if (p->parents)
- mark_parents_uninteresting(p);
-@@ -1136,7 +1136,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
- struct commit *p = parent->item;
- int gently = revs->ignore_missing_links ||
- revs->exclude_promisor_objects;
-- if (parse_commit_gently(p, gently) < 0) {
-+ if (repo_parse_commit_gently(revs->repo, p, gently) < 0) {
- if (revs->exclude_promisor_objects &&
- is_promisor_object(&p->object.oid)) {
- if (revs->first_parent_only)
-@@ -3296,7 +3296,7 @@ static void explore_walk_step(struct rev_info *revs)
- if (!c)
- return;
-
-- if (parse_commit_gently(c, 1) < 0)
-+ if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
- return;
-
- if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
-@@ -3334,7 +3334,7 @@ static void indegree_walk_step(struct rev_info *revs)
- if (!c)
- return;
-
-- if (parse_commit_gently(c, 1) < 0)
-+ if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
- return;
-
- explore_to_depth(revs, commit_graph_generation(c));
-@@ -3416,7 +3416,7 @@ static void init_topo_walk(struct rev_info *revs)
- struct commit *c = list->item;
- uint32_t generation;
-
-- if (parse_commit_gently(c, 1))
-+ if (repo_parse_commit_gently(revs->repo, c, 1))
- continue;
-
- test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
-@@ -3480,7 +3480,7 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
- if (parent->object.flags & UNINTERESTING)
- continue;
-
-- if (parse_commit_gently(parent, 1) < 0)
-+ if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
- continue;
-
- generation = commit_graph_generation(parent);
---
-2.27.0
-
diff --git a/pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch b/pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch
@@ -1,45 +0,0 @@
-From a6b653527f20282c3eeff86551d4ca49b81861e3 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 21 Jun 2020 14:31:53 -0700
-Subject: [PATCH] submodule: use submodule repository when preparing summary
-
-This prevents looking up a submodule commit in the outer repository's
-commit graph, causing a fatal error.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- submodule.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/submodule.c b/submodule.c
-index e2ef5698c8..937c4f4fdc 100644
---- a/submodule.c
-+++ b/submodule.c
-@@ -438,13 +438,13 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
- */
- }
-
--static int prepare_submodule_summary(struct rev_info *rev, const char *path,
-+static int prepare_submodule_summary(struct repository *r, struct rev_info *rev, const char *path,
- struct commit *left, struct commit *right,
- struct commit_list *merge_bases)
- {
- struct commit_list *list;
-
-- repo_init_revisions(the_repository, rev, NULL);
-+ repo_init_revisions(r, rev, NULL);
- setup_revisions(0, NULL, rev, NULL);
- rev->left_right = 1;
- rev->first_parent_only = 1;
-@@ -632,7 +632,7 @@ void show_submodule_summary(struct diff_options *o, const char *path,
- goto out;
-
- /* Treat revision walker failure the same as missing commits */
-- if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
-+ if (prepare_submodule_summary(sub, &rev, path, left, right, merge_bases)) {
- diff_emit_submodule_error(o, "(revision walker failed)\n");
- goto out;
- }
---
-2.27.0
-
diff --git a/pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch b/pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch
@@ -1,29 +0,0 @@
-From e85b8d3ae6b808e48a1ffd530cf51fee083c0766 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
-
----
- builtin/add.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/builtin/add.c b/builtin/add.c
-index 298e0114f9..565fdab636 100644
---- a/builtin/add.c
-+++ b/builtin/add.c
-@@ -192,9 +192,11 @@ int run_add_interactive(const char *revision, const char *patch_mode,
- int use_builtin_add_i =
- git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
-
-- if (use_builtin_add_i < 0)
-+ if (use_builtin_add_i < 0) {
-+ use_builtin_add_i = 1;
- git_config_get_bool("add.interactive.usebuiltin",
- &use_builtin_add_i);
-+ }
-
- if (use_builtin_add_i == 1) {
- enum add_p_mode mode;
---
-2.27.0
-
diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-3cfca28a88d5b8112ea42322b797a500a14d0acddea391aed0462aff1ab11bf7 git-manpages-2.28.0.tar.gz
+8f3bf70ddb515674ce2e19572920a39b1be96af12032b77f1dd57898981fb151 git-manpages-2.29.0.tar.gz
diff --git a/pkg/git/url b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.0.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.0.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
@@ -1 +1 @@
-2.28.0 r0
+2.29.0 r0
