summaryrefslogtreecommitdiff
path: root/pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-10-19 17:43:14 -0700
committerMichael Forney <mforney@mforney.org>2020-10-19 18:29:34 -0700
commitf0f4b6dc3de71c50b6e06a180e3d95f4111d13f0 (patch)
treec3c28151a5171646eb0357c50d485880e1efe334 /pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch
parent6e75fa7ed5a29422dab43a01cddd86e4b55bebcd (diff)
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 (limited to 'pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch')
-rw-r--r--pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch45
1 files changed, 0 insertions, 45 deletions
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
deleted file mode 100644
index 5a168d13..00000000
--- a/pkg/git/patch/0002-submodule-use-submodule-repository-when-preparing-su.patch
+++ /dev/null
@@ -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
-