sequencer: rename reset_for_rollback to reset_merge

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 5a09fe24cddac79bb66f90b0405f5bcc9855dbee..4ba63d5ac642844832a5c832cea93ddf99507764 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
        if (strcmp(remote->name, repository_format_partial_clone)) {
                if (filter_options.choice)
                        die(_("--filter can only be used with the remote "
-                             "configured in extensions.partialclone"));
+                             "configured in extensions.partialClone"));
                return;
        }
 
@@ -1556,7 +1556,9 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru
 
        sigchain_push_common(unlock_pack_on_signal);
        atexit(unlock_pack);
+       sigchain_push(SIGPIPE, SIG_IGN);
        exit_code = do_fetch(gtransport, &rs);
+       sigchain_pop(SIGPIPE);
        refspec_clear(&rs);
        transport_disconnect(gtransport);
        gtransport = NULL;