From: Nguyễn Thái Ngọc Duy <[email protected]> We detach after creating and opening the named pipe, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests.
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Documentation/git-index-helper.txt b/Documentation/git-index-helper.txt index 7afc5c9..b858a8d 100644 --- a/Documentation/git-index-helper.txt +++ b/Documentation/git-index-helper.txt @@ -31,6 +31,9 @@ OPTIONS for reading an index, but because it will happen in the background, it's not noticable. `--strict` is enabled by default. +--detach:: + Detach from the shell. + NOTES ----- $GIT_DIR/index-helper.pipe is a named pipe that the daemon reads diff --git a/index-helper.c b/index-helper.c index 8d221e0..a854ed8 100644 --- a/index-helper.c +++ b/index-helper.c @@ -15,7 +15,7 @@ struct shm { static struct shm shm_index; static struct shm shm_base_index; -static int to_verify = 1; +static int daemonized, to_verify = 1; static void release_index_shm(struct shm *is) { @@ -34,6 +34,8 @@ static void cleanup_shm(void) static void cleanup(void) { + if (daemonized) + return; unlink(git_path("index-helper.pipe")); cleanup_shm(); } @@ -229,7 +231,7 @@ static const char * const usage_text[] = { int main(int argc, char **argv) { const char *prefix; - int idle_in_seconds = 600; + int idle_in_seconds = 600, detach = 0; int fd; struct strbuf pipe_path = STRBUF_INIT; struct option options[] = { @@ -237,6 +239,7 @@ int main(int argc, char **argv) N_("exit if not used after some seconds")), OPT_BOOL(0, "strict", &to_verify, "verify shared memory after creating"), + OPT_BOOL(0, "detach", &detach, "detach the process"), OPT_END() }; @@ -258,6 +261,10 @@ int main(int argc, char **argv) fd = setup_pipe(pipe_path.buf); if (fd < 0) die_errno("Could not set up index-helper.pipe"); + + if (detach && daemonize(&daemonized)) + die_errno("unable to detach"); + loop(fd, idle_in_seconds); return 0; } -- 2.4.2.767.g62658d5-twtrsrc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
