* Use auto
* Use override
* Use some member initializers
Change-Id: I3ca000d1c8e4d02331d58b85e68e4d771c636b29
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Symbolic link conflict is printed in 2 phases: First " {remote}", and
then "a symbolic link -> 'foo.cpp'".
This happens because this message involves an additional cat process:
elif is_symlink "$mode"
then
echo "a symbolic link -> '$(cat "$file")'"
For local/remote line, wait for a full line before parsing.
Change-Id: I641cde12aa44dee2f7dff8fdae70da0c443e55d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
readData always returns 0 in Qt 5.7 (unless the process is not
running)...
Instead, write to the VCS output pane when reading from/writing to the
process.
Change-Id: Ie832d813d5a859b4ff5841fd2888783833c97945
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
To reproduce, create a conflict and configure a custom mergetool that does
nothing:
git config mergetool.my.cmd true
git config merge.tool my
Then execute merge tool from Qt Creator. The merge tool process hangs
while asking how to handle the unchanged file, and can only be killed
externally.
Change-Id: I4d2a91061bd7549e308f6a25f106e6a7afc5cadb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
* pragma once
* member initialization
* s/struct/class/
* Introduce a static GitPlugin::client() method and use it
Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
