From feb4e3d85097c1bad54310d9188a0ecbd61f86da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Fri, 5 Oct 2018 17:34:15 +0100 Subject: [PATCH] Prevent blocking on interactive $EDITOR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It happens that when merging, git calls out an interactive $EDITOR and waits for user input. This causes SparkleShare to block as well. Signed-off-by: Maxime “pep” Buquet --- Sparkles/Git/Git.Repository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sparkles/Git/Git.Repository.cs b/Sparkles/Git/Git.Repository.cs index 2588d824..b7136fc7 100644 --- a/Sparkles/Git/Git.Repository.cs +++ b/Sparkles/Git/Git.Repository.cs @@ -434,7 +434,7 @@ namespace Sparkles.Git { git = new GitCommand (LocalPath, "config core.ignorecase true"); git.StartAndWaitForExit (); - git = new GitCommand (LocalPath, "merge FETCH_HEAD"); + git = new GitCommand (LocalPath, "merge --no-edit FETCH_HEAD"); git.StartInfo.RedirectStandardOutput = false; string error_output = git.StartAndReadStandardError ();