[Pkg-owncloud-commits] [owncloud-client] 390/484: csync_update: Remove disabled inode check

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 3b7927366abc5a41b593eeb88a2d62ef0a26d5a6
Author: Christian Kamm <mail at ckamm.de>
Date:   Mon Nov 23 12:01:42 2015 +0100

    csync_update: Remove disabled inode check
---
 csync/src/csync_update.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 28d7d0d..2f20c78 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -277,22 +277,7 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
         if (ctx->current == LOCAL_REPLICA &&
                 (!_csync_mtime_equal(fs->mtime, tmp->modtime)
                  // zero size in statedb can happen during migration
-                 || (tmp->size != 0 && fs->size != tmp->size)
-#if 0
-                 /* Comparison of the local inode is disabled because people reported problems
-                  * on windows with flacky inode values, see github bug #779
-                  *
-                  * The inode needs to be observed because:
-                  * $>  echo a > a.txt ; echo b > b.txt
-                  * both files have the same mtime
-                  * sync them.
-                  * $> rm a.txt && mv b.txt a.txt
-                  * makes b.txt appearing as a.txt yet a sync is not performed because
-                  * both have the same modtime as mv does not change that.
-                  */
-                 || fs->inode != tmp->inode
-#endif
-                 )) {
+                 || (tmp->size != 0 && fs->size != tmp->size))) {
 
             if (fs->size == tmp->size && tmp->checksumTypeId) {
                 bool checksumIdentical = false;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git