git-show-branch doc: show -g as synonym to --reflog in the list

diff --git a/http-push.c b/http-push.c
index eca4a8e5e9898c883fe6bcec3a9635dbfce27dd8..18d81acd1b3743761b23ded035dc58e32b6aad80 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -10,6 +10,7 @@
 #include "exec_cmd.h"
 #include "remote.h"
 #include "list-objects.h"
+#include "sigchain.h"
 
 #include <expat.h>
 
@@ -184,21 +185,22 @@ enum dav_header_flag {
        DAV_HEADER_TIMEOUT = (1u << 2)
 };
 
-static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) {
+static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
+{
        struct strbuf buf = STRBUF_INIT;
        struct curl_slist *dav_headers = NULL;
 
-       if(options & DAV_HEADER_IF) {
+       if (options & DAV_HEADER_IF) {
                strbuf_addf(&buf, "If: (<%s>)", lock->token);
                dav_headers = curl_slist_append(dav_headers, buf.buf);
                strbuf_reset(&buf);
        }
-       if(options & DAV_HEADER_LOCK) {
+       if (options & DAV_HEADER_LOCK) {
                strbuf_addf(&buf, "Lock-Token: <%s>", lock->token);
                dav_headers = curl_slist_append(dav_headers, buf.buf);
                strbuf_reset(&buf);
        }
-       if(options & DAV_HEADER_TIMEOUT) {
+       if (options & DAV_HEADER_TIMEOUT) {
                strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout);
                dav_headers = curl_slist_append(dav_headers, buf.buf);
                strbuf_reset(&buf);
@@ -1383,7 +1385,7 @@ static void remove_locks(void)
 static void remove_locks_on_signal(int signo)
 {
        remove_locks();
-       signal(signo, SIG_DFL);
+       sigchain_pop(signo);
        raise(signo);
 }
 
@@ -2194,6 +2196,8 @@ int main(int argc, char **argv)
        struct ref *ref;
        char *rewritten_url = NULL;
 
+       git_extract_argv0_path(argv[0]);
+
        setup_git_directory();
 
        remote = xcalloc(sizeof(*remote), 1);
@@ -2276,10 +2280,7 @@ int main(int argc, char **argv)
                goto cleanup;
        }
 
-       signal(SIGINT, remove_locks_on_signal);
-       signal(SIGHUP, remove_locks_on_signal);
-       signal(SIGQUIT, remove_locks_on_signal);
-       signal(SIGTERM, remove_locks_on_signal);
+       sigchain_push_common(remove_locks_on_signal);
 
        /* Check whether the remote has server info files */
        remote->can_update_info_refs = 0;