From ebb238c88580d6841763187810b6af588f785757 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 2 Aug 2011 10:58:55 +0000 Subject: [PATCH] Git: Fix ignore whitespaces/patience 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 Reviewed-by: Thomas Hartmann --- src/plugins/git/gitclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1bd5f363c70..89725158a5b 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -133,9 +133,9 @@ public: args.append(arg); } - if (m_patience->isChecked() && m_patience->isVisible()) + if (m_patience->isChecked()) args.prepend(QLatin1String("--patience")); - if (m_ignoreSpaces->isChecked() && m_ignoreSpaces->isVisible()) + if (m_ignoreSpaces->isChecked()) args.prepend(QLatin1String("--ignore-space-change")); return args;