From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v2 16/17] index-helper: optionally automatically run
Date: Fri, 18 Mar 2016 21:04:49 -0400 [thread overview]
Message-ID: <1458349490-1704-17-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1458349490-1704-1-git-send-email-dturner@twopensource.com>
Introduce a new config option, indexhelper.autorun, to automatically
run git index-helper before starting up a builtin git command. This
enables users to keep index-helper running without manual
intervention.
Signed-off-by: David Turner <dturner@twopensource.com>
---
git.c | 35 ++++++++++++++++++++++++++++++++++-
t/t7900-index-helper.sh | 16 ++++++++++++++++
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/git.c b/git.c
index 6cc0c07..7d27782 100644
--- a/git.c
+++ b/git.c
@@ -521,6 +521,37 @@ static void strip_extension(const char **argv)
#define strip_extension(cmd)
#endif
+static int want_auto_index_helper(void)
+{
+ int want = -1;
+ const char *value = NULL;
+ const char *key = "indexhelper.autorun";
+
+ if (git_config_key_is_valid(key) &&
+ !git_config_get_value(key, &value)) {
+ int b = git_config_maybe_bool(key, value);
+ want = b >= 0 ? b : 0;
+ }
+ return want;
+}
+
+static void maybe_run_index_helper(struct cmd_struct *cmd)
+{
+ const char *argv[] = {"git-index-helper", "--detach", "--autorun", NULL};
+
+ if (!(cmd->option & NEED_WORK_TREE))
+ return;
+
+ if (want_auto_index_helper() <= 0)
+ return;
+
+ trace_argv_printf(argv, "trace: auto index-helper:");
+
+ if (run_command_v_opt(argv,
+ RUN_SILENT_EXEC_FAILURE | RUN_CLEAN_ON_EXIT))
+ warning(_("You specified indexhelper.autorun, but running git-index-helper failed."));
+}
+
static void handle_builtin(int argc, const char **argv)
{
const char *cmd;
@@ -536,8 +567,10 @@ static void handle_builtin(int argc, const char **argv)
}
builtin = get_builtin(cmd);
- if (builtin)
+ if (builtin) {
+ maybe_run_index_helper(builtin);
exit(run_builtin(builtin, argc, argv));
+ }
}
static void execv_dashed_external(const char **argv)
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index 6020fe4..7fe66b7 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -41,4 +41,20 @@ test_expect_success 'index-helper is quiet with --autorun' '
git index-helper --autorun
'
+test_expect_success 'index-helper autorun works' '
+ rm -f .git/index-helper.pipe &&
+ git status &&
+ test_path_is_missing .git/index-helper.pipe &&
+ test_config indexhelper.autorun true &&
+ git status &&
+ test -p .git/index-helper.pipe &&
+ git status 2>err &&
+ test -p .git/index-helper.pipe &&
+ ! grep -q . err &&
+ git index-helper --kill &&
+ test_config indexhelper.autorun false &&
+ git status &&
+ test_path_is_missing .git/index-helper.pipe
+'
+
test_done
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-03-19 1:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-19 1:04 [PATCH v2 00/15] index-helper, watchman David Turner
2016-03-19 1:04 ` [PATCH v2 01/17] read-cache.c: fix constness of verify_hdr() David Turner
2016-03-19 1:04 ` [PATCH v2 02/17] read-cache: allow to keep mmap'd memory after reading David Turner
2016-03-19 1:04 ` [PATCH v2 03/17] index-helper: new daemon for caching index and related stuff David Turner
2016-03-29 2:31 ` Duy Nguyen
2016-03-29 21:51 ` David Turner
2016-03-19 1:04 ` [PATCH v2 04/17] index-helper: add --strict David Turner
2016-03-19 1:04 ` [PATCH v2 05/17] daemonize(): set a flag before exiting the main process David Turner
2016-03-19 1:04 ` [PATCH v2 06/17] index-helper: add --detach David Turner
2016-03-29 2:35 ` Duy Nguyen
2016-03-19 1:04 ` [PATCH v2 07/17] read-cache: add watchman 'WAMA' extension David Turner
2016-03-19 1:04 ` [PATCH v2 08/17] read-cache: invalidate untracked cache data when reading WAMA David Turner
2016-03-29 2:50 ` Duy Nguyen
2016-03-29 21:22 ` David Turner
2016-03-19 1:04 ` [PATCH v2 09/17] Add watchman support to reduce index refresh cost David Turner
2016-03-24 13:47 ` Jeff Hostetler
2016-03-24 17:58 ` David Turner
2016-03-19 1:04 ` [PATCH v2 10/17] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-03-19 1:04 ` [PATCH v2 11/17] update-index: enable/disable watchman support David Turner
2016-03-19 1:04 ` [PATCH v2 12/17] unpack-trees: preserve index extensions David Turner
2016-03-19 1:04 ` [PATCH v2 13/17] index-helper: kill mode David Turner
2016-03-19 1:04 ` [PATCH v2 14/17] index-helper: don't run if already running David Turner
2016-03-19 1:04 ` [PATCH v2 15/17] index-helper: autorun mode David Turner
2016-03-19 1:04 ` David Turner [this message]
2016-03-19 1:04 ` [PATCH v2 17/17] read-cache: config for waiting for index-helper David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458349490-1704-17-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).