diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-04 19:19:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-04 19:19:11 (GMT) |
| commit | 3a5b6eeceb8ea149ec8c0139f64683942e62722b (patch) | |
| tree | 22d3931ab246e836b6d7bb940c31110e1b0733ce | |
| parent | 2d808073db276a447eb6d7e45afe47a363ff6bbe (diff) | |
| parent | 7f4d4746c14f928b7b6cdc2d21e4bbb2a770187f (diff) | |
| download | git-3a5b6eeceb8ea149ec8c0139f64683942e62722b.zip git-3a5b6eeceb8ea149ec8c0139f64683942e62722b.tar.gz git-3a5b6eeceb8ea149ec8c0139f64683942e62722b.tar.bz2 | |
Merge branch 'np/credential-cache-sighup'
Workaround for using credential-cache with emacs.
* np/credential-cache-sighup:
credential-cache: new option to ignore sighup
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | credential-cache--daemon.c | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b4b0194..2d06b11 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1122,6 +1122,9 @@ credential.<url>.*:: example.com. See linkgit:gitcredentials[7] for details on how URLs are matched. +credentialCache.ignoreSIGHUP:: + Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. + include::diff-config.txt[] difftool.<tool>.path:: diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index 82715aa..9365f2c 100644 --- a/credential-cache--daemon.c +++ b/credential-cache--daemon.c @@ -244,6 +244,7 @@ static void check_socket_directory(const char *path) int main(int argc, const char **argv) { const char *socket_path; + int ignore_sighup = 0; static const char *usage[] = { "git-credential-cache--daemon [opts] <socket_path>", NULL @@ -255,6 +256,8 @@ int main(int argc, const char **argv) OPT_END() }; + git_config_get_bool("credentialcache.ignoresighup", &ignore_sighup); + argc = parse_options(argc, argv, NULL, options, usage, 0); socket_path = argv[0]; @@ -263,6 +266,10 @@ int main(int argc, const char **argv) check_socket_directory(socket_path); register_tempfile(&socket_file, socket_path); + + if (ignore_sighup) + signal(SIGHUP, SIG_IGN); + serve_cache(socket_path, debug); delete_tempfile(&socket_file); |