summaryrefslogtreecommitdiff
path: root/pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.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/0003-Enable-add.interactive.usebuiltin-by-default.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/0003-Enable-add.interactive.usebuiltin-by-default.patch')
-rw-r--r--pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch29
1 files changed, 0 insertions, 29 deletions
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
deleted file mode 100644
index 8fcec6a5..00000000
--- a/pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch
+++ /dev/null
@@ -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
-