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

Git: Fix ignore whitespaces/patience

Browse Source 
Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Tobias Hunger
2011-08-02 10:58:55 +00:00
committed by Thomas Hartmann
parent 87fea757fb
commit ebb238c885
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,9 +133,9 @@ public:
args.append(arg); args.append(arg);
} }
if (m_patience->isChecked() && m_patience->isVisible()) if (m_patience->isChecked())
args.prepend(QLatin1String("--patience")); args.prepend(QLatin1String("--patience"));
if (m_ignoreSpaces->isChecked() && m_ignoreSpaces->isVisible()) if (m_ignoreSpaces->isChecked())
args.prepend(QLatin1String("--ignore-space-change")); args.prepend(QLatin1String("--ignore-space-change"));
return args; return args;