]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
SyncFileItem::operator<: must return false when two items are equal
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 17 Feb 2015 17:22:22 +0000 (18:22 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Wed, 18 Feb 2015 11:41:06 +0000 (12:41 +0100)
Fixes #2852

src/libsync/syncfileitem.h
test/testsyncfileitem.h

index 2fdc0db9cacd2223d3d9bb3cf52346be444ab5ad..9c8e25f5505d71a780180072381438dc9248d63c 100644 (file)
@@ -80,10 +80,10 @@ public:
         auto minSize = std::min(d1.size(), d2.size());
         while (prefixL < minSize && data1[prefixL] == data2[prefixL]) { prefixL++; }
 
-        if (prefixL == d1.size())
-            return true;
         if (prefixL == d2.size())
             return false;
+        if (prefixL == d1.size())
+            return true;
 
         if (data1[prefixL] == '/')
             return true;
index 59ba88fcfd6d183ac9f8a800089521313c069803..5fa062ff3bc9bef8c5c091b2b38dd5e101c3ba38 100644 (file)
@@ -61,6 +61,10 @@ private slots:
         QVERIFY(!(b < a));
         QVERIFY(!(c < b));
         QVERIFY(!(c < a));
+
+        QVERIFY(!(a < a));
+        QVERIFY(!(b < b));
+        QVERIFY(!(c < c));
     }
 };