summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Noam Postavsky <npostavs@users.sourceforge.net>2015-11-09 19:26:29 -0500
committerLibravatar Jeff King <peff@peff.net>2015-11-20 08:02:07 -0500
commit7f4d4746c14f928b7b6cdc2d21e4bbb2a770187f (patch)
treedd31683d38c23910fa9629084785dad1539104a6
parentMerge branch 'master' of git://git.bogomips.org/git-svn (diff)
downloadtgif-7f4d4746c14f928b7b6cdc2d21e4bbb2a770187f.tar.xz
credential-cache: new option to ignore sighup
Introduce new option "credentialCache.ignoreSIGHUP" which stops git-credential-cache--daemon from quitting on SIGHUP. This is useful when "git push" is started from Emacs, because all child processes (including the daemon) will receive a SIGHUP when "git push" exits. Signed-off-by: Noam Postavsky <npostavs@users.sourceforge.net> Signed-off-by: Jeff King <peff@peff.net>
-rw-r--r--Documentation/config.txt3
-rw-r--r--credential-cache--daemon.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b4b01948d0..2d06b11f25 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 82715aa8b8..9365f2ce5c 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);