hbons / SparkleShare

Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows.
https://sparkleshare.org
Other
4.88k stars 579 forks source link

Prevent blocking on interactive $EDITOR #1875

Closed Ppjet6 closed 5 years ago

Ppjet6 commented 5 years ago

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

hbons commented 5 years ago

Great thanks!