feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Simplify code

Browse Source 
Change-Id: I1576c3b8d370fdae660a399654b77af11a5f5d36
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
jkobus
2013-05-23 08:16:41 +02:00
committed by Jarek Kobus
parent d017495a9f
commit a033beecc8
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/gitclient.cpp
View File

@@ -819,14 +819,12 @@ void GitClient::diff(const QString &workingDirectory,
if (unstagedFileNames.empty() && stagedFileNames.empty()) { if (unstagedFileNames.empty() && stagedFileNames.empty()) {
// local repository diff // local repository diff
handler->diffRepository(); handler->diffRepository();
} else if (!stagedFileNames.empty()) {
// diff of selected files only with --cached option, used in commit editor
handler->diffFiles(stagedFileNames, unstagedFileNames);
} else { } else {
if (!stagedFileNames.empty()) { // current project diff
// diff of selected files only with --cached option, used in commit editor handler->diffProjects(unstagedFileNames);
handler->diffFiles(stagedFileNames, unstagedFileNames);
} else if (!unstagedFileNames.empty()) {
// current project diff
handler->diffProjects(unstagedFileNames);
}
} }
} else { } else {
const QString binary = settings()->stringValue(GitSettings::binaryPathKey); const QString binary = settings()->stringValue(GitSettings::binaryPathKey);