Fixed a problem in the --link-dest processing where -I (--ignore-times)

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 00726e0..4c711cd 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "rsync.h"
@@ -606,10 +606,16 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                         char *cmpbuf, STRUCT_STAT *stp, int itemizing,
                         int maybe_ATTRS_REPORT, enum logcode code)
 {
+       int save_ignore_times = ignore_times;
+       int save_size_only = size_only;
        int best_match = -1;
        int match_level = 0;
        int j = 0;
 
+       /* We can't let these send-affecting options affect our checking
+        * for identical files in the alternate basis dirs. */
+       ignore_times = size_only = 0;
+
        do {
                pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
                if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
@@ -628,7 +634,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                case 2:
                        if (!unchanged_attrs(file, stp))
                                continue;
-                       if ((always_checksum || ignore_times)
+                       if (always_checksum
                         && cmp_time(stp->st_mtime, file->modtime))
                                continue;
                        best_match = j;
@@ -638,6 +644,9 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                break;
        } while (basis_dir[++j] != NULL);
 
+       ignore_times = save_ignore_times;
+       size_only = save_size_only;
+
        if (!match_level)
                return -1;