Add a configuration variable, indexhelper.exitafter, which provides a
default time to keep the index-helper alive. This is useful with
indexhelper.autorun; some users will want to keep the
automatically-run index-helper alive across their lunch break and will
thus set indexhelper.exitafter to a high value.
Signed-off-by: David Turner <dturner@xxxxxxxxxxxxxxxx>
---
Documentation/config.txt | 4 ++++
index-helper.c | 2 ++
t/t7900-index-helper.sh | 8 ++++++++
3 files changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 385ea66..336d5a2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1860,6 +1860,10 @@ indexhelper.autorun::
Automatically run git index-helper when any builtin git
command is run inside a repository.
+indexhelper.exitafter::
+ When no exit-after argument is given, git index-helper defaults
+ to this number of seconds. Specify 0 to wait forever. Default is 600.
+
init.templateDir::
Specify the directory from which templates will be copied.
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
diff --git a/index-helper.c b/index-helper.c
index 2d97c77..a639de8 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -425,6 +425,8 @@ int main(int argc, char **argv)
git_extract_argv0_path(argv[0]);
git_setup_gettext();
+ git_config_get_int("indexhelper.exitafter", &idle_in_seconds);
+
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(usage_text, options);
diff --git a/t/t7900-index-helper.sh b/t/t7900-index-helper.sh
index 3cfdf63..6c9b4dd 100755
--- a/t/t7900-index-helper.sh
+++ b/t/t7900-index-helper.sh
@@ -66,4 +66,12 @@ test_expect_success 'index-helper autorun works' '
test_path_is_missing .git/index-helper.sock
'
+test_expect_success 'indexhelper.exitafter config works' '
+ test_when_finished "git index-helper --kill" &&
+ test_config indexhelper.exitafter 1 &&
+ git index-helper --detach &&
+ sleep 3 &&
+ test_path_is_missing .git/index-helper.sock
+'
+
test_done
--
2.4.2.767.g62658d5-twtrsrc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html