Prevent blocking on interactive $EDITOR
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 <pep@collabora.com>
This commit is contained in:
parent
3b4fccd6a2
commit
feb4e3d850
|
@ -434,7 +434,7 @@ namespace Sparkles.Git {
|
||||||
git = new GitCommand (LocalPath, "config core.ignorecase true");
|
git = new GitCommand (LocalPath, "config core.ignorecase true");
|
||||||
git.StartAndWaitForExit ();
|
git.StartAndWaitForExit ();
|
||||||
|
|
||||||
git = new GitCommand (LocalPath, "merge FETCH_HEAD");
|
git = new GitCommand (LocalPath, "merge --no-edit FETCH_HEAD");
|
||||||
git.StartInfo.RedirectStandardOutput = false;
|
git.StartInfo.RedirectStandardOutput = false;
|
||||||
|
|
||||||
string error_output = git.StartAndReadStandardError ();
|
string error_output = git.StartAndReadStandardError ();
|
||||||
|
|
Loading…
Reference in a new issue