summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-06-27 14:57:43 -0700
committerMichael Forney <mforney@mforney.org>2020-06-30 13:00:03 -0700
commit62fcb6f167be7cfa2215e2dca99a4c375ff8be82 (patch)
tree0d144a4bd2ad60100540a4f92a8c7d80cfd92a18 /pkg
parentea8181ae6b127a92e503c5307d980134ee37f092 (diff)
git: Enable add.interactive.usebuiltin by default
We don't have perl, so this allows usage of `git add -i` by default.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch29
-rw-r--r--pkg/git/ver2
2 files changed, 30 insertions, 1 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
new file mode 100644
index 00000000..8fcec6a5
--- /dev/null
+++ b/pkg/git/patch/0003-Enable-add.interactive.usebuiltin-by-default.patch
@@ -0,0 +1,29 @@
+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/ver b/pkg/git/ver
index a5c49e05..60c7538a 100644
--- a/pkg/git/ver
+++ b/pkg/git/ver
@@ -1 +1 @@
-2.27.0 r1
+2.27.0 r2