forked from qt-creator/qt-creator
Git: Fix unstaging modified files
Regression introduced in ab85e7342e
Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user