beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Prevent blocking on interactive $EDITOR

Browse source 
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:
Maxime “pep” Buquet 2018-10-05 17:34:15 +01:00 committed by Maxime “pep” Buquet
parent 3b4fccd6a2
commit feb4e3d850
No known key found for this signature in database
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sparkles/Git/Git.Repository.cs
View file

@ -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 ();