From 479298dba59e05acaf54521f3e2e8db485e3b800 Mon Sep 17 00:00:00 2001
From: sebn <sebn@users.noreply.github.com>
Date: Fri, 12 Oct 2018 15:32:40 +0200
Subject: [PATCH] core/local/analysis: Don't confuse addDir(a)+addDir(a) with
 ident. renaming (#1201)

---
 core/local/analysis.js      |  2 +-
 test/unit/local/analysis.js | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/core/local/analysis.js b/core/local/analysis.js
index 8dd4b13c2..61b0c237b 100644
--- a/core/local/analysis.js
+++ b/core/local/analysis.js
@@ -119,7 +119,7 @@ function analyseEvents (events /*: LocalEvent[] */, pendingChanges /*: LocalChan
               break
             }
             const addChange /*: ?LocalDirAddition */ = localChange.maybePutFolder(getChangeByInode(e))
-            if (addChange) {
+            if (addChange && addChange.path !== e.path) {
               changeFound(localChange.dirRenamingCaseOnlyFromAddAdd(addChange, e))
               break
             }
diff --git a/test/unit/local/analysis.js b/test/unit/local/analysis.js
index 3847b6353..f511028e2 100644
--- a/test/unit/local/analysis.js
+++ b/test/unit/local/analysis.js
@@ -242,6 +242,28 @@ describe('core/local/analysis', function () {
     should(pendingChanges).deepEqual([])
   })
 
+  it('identifies 2 successive addDir on same path/ino but different stats as DirAddition(foo/) with the last stats', () => {
+    const path = 'foo'
+    const ino = 1
+    const old /*: Metadata */ = metadataBuilders.dir().path(path).ino(ino).build()
+    const stats1 = {ino, size: 64}
+    const stats2 = {ino, size: 1312}
+    const events /*: LocalEvent[] */ = [
+      {type: 'addDir', path, stats: stats1, old},
+      {type: 'addDir', path, stats: stats2, old}
+    ]
+    const pendingChanges = []
+
+    should(analysis(events, pendingChanges)).deepEqual([{
+      sideName,
+      type: 'DirAddition',
+      path,
+      ino,
+      stats: stats2,
+      old
+    }])
+  })
+
   it('identifies addDir({path: foo, ino: 1}) + addDir({path: FOO, ino: 1}) as DirMove(foo, FOO)', () => {
     const old /*: Metadata */ = metadataBuilders.dir().path('foo').ino(1).build()
     const stats = {ino: 1}