* [PATCH v14 20/21] index-helper: indexhelper.exitAfter config
@ 2016-07-04 6:05 David Turner
2016-07-04 6:05 ` [PATCH v14 21/21] mailmap: use main email address for dturner David Turner
0 siblings, 1 reply; 4+ messages in thread
From: David Turner @ 2016-07-04 6:05 UTC (permalink / raw)
To: git, pclouds, kmaggg; +Cc: David Turner, Junio C Hamano
From: David Turner <dturner@twopensource.com>
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@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v14 21/21] mailmap: use main email address for dturner
2016-07-04 6:05 [PATCH v14 20/21] index-helper: indexhelper.exitAfter config David Turner
@ 2016-07-04 6:05 ` David Turner
2016-07-06 17:56 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: David Turner @ 2016-07-04 6:05 UTC (permalink / raw)
To: git, pclouds, kmaggg; +Cc: David Turner
Signed-off-by: David Turner <novalis@novalis.org>
---
.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 <ddkilzer@kilzer.net>
David Kågedal <davidk@lysator.liu.se>
David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
David S. Miller <davem@davemloft.net>
+David Turner <novalis@novalis.org> <dturner@twopensource.com>
Deskin Miller <deskinm@umich.edu>
Dirk Süsserott <newsletter@dirk.my1.cc>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v14 21/21] mailmap: use main email address for dturner
2016-07-04 6:05 ` [PATCH v14 21/21] mailmap: use main email address for dturner David Turner
@ 2016-07-06 17:56 ` Junio C Hamano
2016-07-07 12:27 ` Johannes Schindelin
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2016-07-06 17:56 UTC (permalink / raw)
To: David Turner; +Cc: git, pclouds, kmaggg
David Turner <novalis@novalis.org> writes:
> Signed-off-by: David Turner <novalis@novalis.org>
> ---
> .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 <ddkilzer@kilzer.net>
> David Kågedal <davidk@lysator.liu.se>
> David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
> David S. Miller <davem@davemloft.net>
> +David Turner <novalis@novalis.org> <dturner@twopensource.com>
> Deskin Miller <deskinm@umich.edu>
> Dirk Süsserott <newsletter@dirk.my1.cc>
> Eric Blake <eblake@redhat.com> <ebb9@byu.net>
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v14 21/21] mailmap: use main email address for dturner
2016-07-06 17:56 ` Junio C Hamano
@ 2016-07-07 12:27 ` Johannes Schindelin
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2016-07-07 12:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: David Turner, git, pclouds, kmaggg
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
Hi,
On Wed, 6 Jul 2016, Junio C Hamano wrote:
> David Turner <novalis@novalis.org> writes:
>
> > Signed-off-by: David Turner <novalis@novalis.org>
> > ---
> > .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 <ddkilzer@kilzer.net>
> > David Kågedal <davidk@lysator.liu.se>
> > David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
> > David S. Miller <davem@davemloft.net>
> > +David Turner <novalis@novalis.org> <dturner@twopensource.com>
> > Deskin Miller <deskinm@umich.edu>
> > Dirk Süsserott <newsletter@dirk.my1.cc>
> > Eric Blake <eblake@redhat.com> <ebb9@byu.net>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-07 12:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-04 6:05 [PATCH v14 20/21] index-helper: indexhelper.exitAfter config David Turner
2016-07-04 6:05 ` [PATCH v14 21/21] mailmap: use main email address for dturner David Turner
2016-07-06 17:56 ` Junio C Hamano
2016-07-07 12:27 ` Johannes Schindelin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.