Commit 31f46bf7 authored by Sebastian Englbrecht's avatar Sebastian Englbrecht Committed by Elvis Angelaccio
Browse files

Git status does not generate index.lock

The git option (Note: not git status) --no-optional-locks prohibits the generation
of the lockfile in read-only operation, thus not blocking other e.g. manually typed commands.

BUG: 363576
parent 24d9da55
...@@ -176,7 +176,7 @@ bool FileViewGitPlugin::beginRetrieval(const QString& directory) ...@@ -176,7 +176,7 @@ bool FileViewGitPlugin::beginRetrieval(const QString& directory)
m_versionInfoHash.clear(); m_versionInfoHash.clear();
// ----- find files with special status ----- // ----- find files with special status -----
process.start("git", {"status", "--porcelain", "-z", "-u", "--ignored"}); process.start("git", {"--no-optional-locks", "status", "--porcelain", "-z", "-u", "--ignored"});
while (process.waitForReadyRead()) { while (process.waitForReadyRead()) {
char buffer[1024]; char buffer[1024];
while (readUntilZeroChar(&process, buffer, sizeof(buffer)) > 0 ) { while (readUntilZeroChar(&process, buffer, sizeof(buffer)) > 0 ) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment