Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 Documentation/git-index-helper.txt |  3 +++
 index-helper.c                     | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-index-helper.txt 
b/Documentation/git-index-helper.txt
index 406856d..d8fbdab 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
 -----
 On UNIX-like systems, $GIT_DIR/index-helper.pid contains the process
diff --git a/index-helper.c b/index-helper.c
index c82d307..4262678 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -13,7 +13,7 @@ struct index_shm {
 
 static struct index_shm shm_index;
 static struct index_shm shm_base_index;
-static int to_verify = 1;
+static int daemonized, to_verify = 1;
 
 static void free_index_shm(struct index_shm *is)
 {
@@ -32,6 +32,8 @@ static void cleanup_shm(void)
 
 static void cleanup(void)
 {
+       if (daemonized)
+               return;
        unlink(git_path("index-helper.pid"));
        cleanup_shm();
 }
@@ -164,12 +166,13 @@ int main(int argc, char **argv)
        static struct lock_file lock;
        struct strbuf sb = STRBUF_INIT;
        const char *prefix;
-       int fd, idle_in_minutes = 10;
+       int fd, idle_in_minutes = 10, detach = 0;
        struct option options[] = {
                OPT_INTEGER(0, "exit-after", &idle_in_minutes,
                            N_("exit if not used after some minutes")),
                OPT_BOOL(0, "strict", &to_verify,
                         "verify shared memory after creating"),
+               OPT_BOOL(0, "detach", &detach, "detach the process"),
                OPT_END()
        };
 
@@ -196,6 +199,9 @@ int main(int argc, char **argv)
        atexit(cleanup);
        sigchain_push_common(cleanup_on_signal);
 
+       if (detach && daemonize(&daemonized))
+               die_errno("unable to detach");
+
        if (!idle_in_minutes)
                idle_in_minutes = 0xffffffff / 60;
        loop(sb.buf, idle_in_minutes * 60);
-- 
2.1.0.rc0.66.gb9187ad

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to