./configure (optional if already run)
make
-based-on: 16b49716d55a50f2e985b879b720b2c53c892a3a
+based-on: db5bfe67a5d022f9ad25340db6bc2cca2cbbdb65
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -63,6 +63,7 @@ extern int append_mode;
+@@ -67,6 +67,7 @@ extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -571,6 +572,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
- /* Perform our quick-check heuristic for determining if a file is unchanged. */
- int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
- {
-+ if (date_only)
-+ return cmp_time(st->st_mtime, file->modtime) == 0;
-+
- if (st->st_size != F_LENGTH(file))
- return 0;
+@@ -621,6 +622,9 @@ int quick_check_ok(enum filetype ftype, const char *fn, struct file_struct *file
+ if (st->st_size != F_LENGTH(file))
+ return 0;
++ if (date_only)
++ return !mtime_differs(st, file);
++
+ /* If always_checksum is set then we use the checksum instead
+ * of the file mtime to determine whether to sync. */
+ if (always_checksum > 0) {
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -108,6 +108,7 @@ int safe_symlinks = 0;
+@@ -119,6 +119,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
int munge_symlinks = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -755,6 +756,7 @@ void usage(enum logcode F)
- rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
- rprintf(F," -M, --remote-option=OPTION send OPTION to the remote side only\n");
- rprintf(F," --size-only skip files that match in size\n");
-+ rprintf(F," --date-only skip files that match in mod-time\n");
- rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
- rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
- rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
-@@ -910,6 +912,7 @@ static struct poptOption long_options[] = {
+@@ -688,6 +689,7 @@ static struct poptOption long_options[] = {
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
-@@ -2649,6 +2652,9 @@ void server_options(char **args, int *argc_p)
+@@ -2830,6 +2832,9 @@ void server_options(char **args, int *argc_p)
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
+ if (date_only)
+ args[ac++] = "--date-only";
+
- if (modify_window_set) {
- if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
- goto oom;
-diff --git a/rsync.yo b/rsync.yo
---- a/rsync.yo
-+++ b/rsync.yo
-@@ -413,6 +413,7 @@ to the detailed description below for a complete description. verb(
- --contimeout=SECONDS set daemon connection timeout in seconds
- -I, --ignore-times don't skip files that match size and time
- --size-only skip files that match in size
-+ --date-only skip files that match in mod-time
- --modify-window=NUM compare mod-times with reduced accuracy
- -T, --temp-dir=DIR create temporary files in directory DIR
- -y, --fuzzy find similar file for basis if no dest file
-@@ -605,6 +606,12 @@ time to just looking for files that have changed in size. This is useful
- when starting to use rsync after using another mirroring system which may
- not preserve timestamps exactly.
+ if (modify_window_set && am_sender) {
+ char *fmt = modify_window < 0 ? "-@%d" : "--modify-window=%d";
+ if (asprintf(&arg, fmt, modify_window) < 0)
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -468,6 +468,7 @@ has its own detailed description later in this manpage.
+ --contimeout=SECONDS set daemon connection timeout in seconds
+ --ignore-times, -I don't skip files that match size and time
+ --size-only skip files that match in size
++--date-only skip files that match in mod-time
+ --modify-window=NUM, -@ set the accuracy for mod-time comparisons
+ --temp-dir=DIR, -T create temporary files in directory DIR
+ --fuzzy, -y find similar file for basis if no dest file
+@@ -737,6 +738,14 @@ expand it.
+ after using another mirroring system which may not preserve timestamps
+ exactly.
-+dit(bf(--date-only)) Normally rsync will skip any files that are
-+already the same size and have the same modification time-stamp. With the
-+--date-only option, files will be skipped if they have the same
-+timestamp, regardless of size. This may be useful when the remote
-+files have passed through a size-changing filter, e.g. for encryption.
++0. `--date-only`
+
- dit(bf(--modify-window)) When comparing two timestamps, rsync treats the
- timestamps as being equal if they differ by no more than the modify-window
- value. This is normally 0 (for an exact match), but you may find it useful
++ Normally rsync will skip any files that are already the same size and have
++ the same modification time-stamp. With the `--date-only` option, files will
++ be skipped if they have the same timestamp, regardless of size. This may be
++ useful when the remote files have passed through a size-changing filter,
++ e.g. for encryption.
++
+ 0. `--modify-window=NUM`, `-@`
+
+ When comparing two timestamps, rsync treats the timestamps as being equal
git.samba.org / rsync.git / patches.git / blobdiff