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

Merge pull request #1875 from Ppjet6/prevent-interactive-editor

Browse source 
Prevent blocking on interactive $EDITOR
This commit is contained in:
Hylke Bons 2018-10-05 18:15:39 +01:00 committed by GitHub
parent 3b4fccd6a2 feb4e3d850
commit cf313dce4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 ();