From: Thomas Zander Date: Thu, 23 Jul 2009 18:30:48 +0000 (+0300) Subject: Fix writing renames to only happen on rename. X-Git-Url: https://repo.or.cz/w/vng.git/commitdiff_plain/440d23f62435550c6e40f70a5f6b59ed54afc224 Fix writing renames to only happen on rename. --- diff --git a/src/hunks/ChangeSet.cpp b/src/hunks/ChangeSet.cpp index 605ca83..0624016 100644 --- a/src/hunks/ChangeSet.cpp +++ b/src/hunks/ChangeSet.cpp @@ -541,7 +541,7 @@ void ChangeSet::writeDiff(QIODevice &outDevice, ChangeSet::Selection selection) bool fileHeaderWritten = false; if ((selection == AllHunks || (selection == UserSelection && file.renameAcceptance() == Vng::Accepted)) - && !file.oldFileName().isEmpty() + && !file.oldFileName().isEmpty() && !file.fileName().isEmpty() && file.oldFileName() != file.fileName()) { writeRenameDiff(diff, file); continue;