From bb02af93dda59ce8f6cf63ab0effc1bb40d1301b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 6 Oct 2010 17:50:27 +0200
Subject: [PATCH] Git: Consider new files a diff
When checking for a difference and being asked to handle untracked
files: Actually consider the presence of untracked files a change.
Fixes git commit editor not coming up when there were no changes,
only additions of new files.
---
src/plugins/git/gitclient.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 31d39ec6fc3..1e9adeb5142 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1274,9 +1274,10 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory,
return StatusFailed;
}
// Unchanged (output text depending on whether -u was passed)
- if (outputText.contains("nothing to commit")
- || outputText.contains("nothing added to commit but untracked files present"))
+ if (outputText.contains("nothing to commit"))
return StatusUnchanged;
+ if (outputText.contains("nothing added to commit but untracked files present"))
+ return untracked ? StatusChanged : StatusUnchanged;
return StatusChanged;
}
--
GitLab