Merge branch 'jk/write-file'

diff --git a/git.c b/git.c
index b65083ca9779cb5939309a13581ecf000dc4b196..0f1937fd0c23da7c316540b8f9a6b05746011506 100644 (file)
--- a/git.c
+++ b/git.c
@@ -609,27 +609,6 @@ static int run_argv(int *argcp, const char ***argv)
        return done_alias;
 }
 
-/*
- * Many parts of Git have subprograms communicate via pipe, expect the
- * upstream of a pipe to die with SIGPIPE when the downstream of a
- * pipe does not need to read all that is written.  Some third-party
- * programs that ignore or block SIGPIPE for their own reason forget
- * to restore SIGPIPE handling to the default before spawning Git and
- * break this carefully orchestrated machinery.
- *
- * Restore the way SIGPIPE is handled to default, which is what we
- * expect.
- */
-static void restore_sigpipe_to_default(void)
-{
-       sigset_t unblock;
-
-       sigemptyset(&unblock);
-       sigaddset(&unblock, SIGPIPE);
-       sigprocmask(SIG_UNBLOCK, &unblock, NULL);
-       signal(SIGPIPE, SIG_DFL);
-}
-
 int cmd_main(int argc, const char **argv)
 {
        const char *cmd;
@@ -639,10 +618,6 @@ int cmd_main(int argc, const char **argv)
        if (!cmd)
                cmd = "git-help";
 
-       restore_sigpipe_to_default();
-
-       git_setup_gettext();
-
        trace_command_performance(argv);
 
        /*