# [PATCH v14 20/21] index-helper: indexhelper.exitAfter config 4 messages from 2016-07-04 to 2016-07-07. Participants: David Turner, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/42770 ## David Turner, 2016-07-04 06:05 Subject: [PATCH v14 20/21] index-helper: indexhelper.exitAfter config Message-ID: <1467612324-23556-1-git-send-email-novalis@novalis.org> URL: https://gitlist.dev/e/1467612324-23556-1-git-send-email-novalis%40novalis.org ``` From: David Turner 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 Signed-off-by: Junio C Hamano --- 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..a6330b1 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 af35485..7e62425 100644 --- a/index-helper.c +++ b/index-helper.c @@ -399,6 +399,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 15ba612..12b5bf7 100755 --- a/t/t7900-index-helper.sh +++ b/t/t7900-index-helper.sh @@ -68,4 +68,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 -- 1.9.1 ``` ## David Turner, 2016-07-04 06:05 Subject: [PATCH v14 21/21] mailmap: use main email address for dturner Message-ID: <1467612324-23556-2-git-send-email-novalis@novalis.org> URL: https://gitlist.dev/e/1467612324-23556-2-git-send-email-novalis%40novalis.org In-Reply-To: <1467612324-23556-1-git-send-email-novalis@novalis.org> ``` Signed-off-by: David Turner --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index e5b4126..edcae89 100644 --- a/.mailmap +++ b/.mailmap @@ -46,6 +46,7 @@ David D. Kilzer David Kågedal David Reiss David S. Miller +David Turner Deskin Miller Dirk Süsserott Eric Blake -- 1.9.1 ``` ## Junio C Hamano, 2016-07-06 17:56 Subject: Re: [PATCH v14 21/21] mailmap: use main email address for dturner Message-ID: URL: https://gitlist.dev/e/xmqq4m82tzun.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1467612324-23556-2-git-send-email-novalis@novalis.org> ``` David Turner writes: > Signed-off-by: David Turner > --- > .mailmap | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/.mailmap b/.mailmap > index e5b4126..edcae89 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -46,6 +46,7 @@ David D. Kilzer > David Kågedal > David Reiss > David S. Miller > +David Turner > Deskin Miller > Dirk Süsserott > Eric Blake Let me take this separately and directly to the 'master', not as part of this series. Not that I am rejecting the remainder of the series, though. Thanks. ``` ## Johannes Schindelin, 2016-07-07 12:27 Subject: Re: [PATCH v14 21/21] mailmap: use main email address for dturner Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.20.1607071426090.6426%40virtualbox In-Reply-To: ``` Hi, On Wed, 6 Jul 2016, Junio C Hamano wrote: > David Turner writes: > > > Signed-off-by: David Turner > > --- > > .mailmap | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/.mailmap b/.mailmap > > index e5b4126..edcae89 100644 > > --- a/.mailmap > > +++ b/.mailmap > > @@ -46,6 +46,7 @@ David D. Kilzer > > David Kågedal > > David Reiss > > David S. Miller > > +David Turner > > Deskin Miller > > Dirk Süsserott > > Eric Blake > > Let me take this separately and directly to the 'master', not as > part of this series. > > Not that I am rejecting the remainder of the series, though. Speaking of which... Dave, I see that a lot of the patches in the series still use the old mail address. Maybe change that? Ciao, Dscho ```