From a547b6af46d015550d024ce143ab195a48a8e638 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 25 Feb 2013 22:43:36 +0200 Subject: [PATCH] Git: Fix unstaging modified files Regression introduced in ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6 Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 9bf1c7e374..eb1bdff345 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1906,7 +1906,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, filesToAdd.append(file); if ((state & StagedFile) && !checked) { - if (state & (AddedFile | DeletedFile)) { + if (state & (ModifiedFile | AddedFile | DeletedFile)) { filesToReset.append(file); } else if (state & (RenamedFile | CopiedFile)) { const QString newFile = file.mid(file.indexOf(renameSeparator) + renameSeparator.count()); -- GitLab