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

Git: Fix unstaging modified files

Browse Source 
Regression introduced in ab85e7342e

Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-25 22:43:36 +02:00
parent 66c51cd326
commit a547b6af46
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1906,7 +1906,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
filesToAdd.append(file); filesToAdd.append(file);
if ((state & StagedFile) && !checked) { if ((state & StagedFile) && !checked) {
if (state & (AddedFile | DeletedFile)) { if (state & (ModifiedFile | AddedFile | DeletedFile)) {
filesToReset.append(file); filesToReset.append(file);
} else if (state & (RenamedFile | CopiedFile)) { } else if (state & (RenamedFile | CopiedFile)) {
const QString newFile = file.mid(file.indexOf(renameSeparator) + renameSeparator.count()); const QString newFile = file.mid(file.indexOf(renameSeparator) + renameSeparator.count());