Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.0pre8.
[rsync/rsync-patches.git]
/
detect-renamed.diff
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
6a30631
..
90f3803
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-452,7
+452,7
@@
diff --git a/generator.c b/generator.c
if (do_progress && !am_server)
rprintf(FINFO, " \r");
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -113
9,6 +1290
,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -113
7,6 +1288
,7 @@ static void list_file_entry(struct file_struct *f)
}
}
}
}
@@
-460,7
+460,7
@@
diff --git a/generator.c b/generator.c
static int phase = 0;
static int dflt_perms;
static int phase = 0;
static int dflt_perms;
-@@ -138
3,8 +1535
,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -138
1,8 +1533
,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
}
else if (delete_during && f_out != -1 && !phase && dry_run < 2
}
}
else if (delete_during && f_out != -1 && !phase && dry_run < 2
@@
-475,7
+475,7
@@
diff --git a/generator.c b/generator.c
goto cleanup;
}
goto cleanup;
}
-@@ -166
2,8 +1818
,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -166
0,8 +1816
,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto cleanup;
}
#endif
goto cleanup;
}
#endif
@@
-491,7
+491,7
@@
diff --git a/generator.c b/generator.c
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -200
0,6 +2162
,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -200
4,6 +2166
,12 @@ void generate_files(int f_out, const char *local_name)
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
@@
-504,7
+504,7
@@
diff --git a/generator.c b/generator.c
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -201
0,7 +2178
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -201
4,7 +2182
,7 @@ void generate_files(int f_out, const char *local_name)
}
do_progress = 0;
}
do_progress = 0;
@@
-513,7
+513,7
@@
diff --git a/generator.c b/generator.c
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -20
48,7 +2216
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -20
52,7 +2220
,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
@@
-522,7
+522,7
@@
diff --git a/generator.c b/generator.c
}
}
}
}
}
}
-@@ -209
1,7 +2259
,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -209
5,7 +2263
,21 @@ void generate_files(int f_out, const char *local_name)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
@@
-634,7
+634,7
@@
diff --git a/rsync.yo b/rsync.yo
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
diff --git a/util.c b/util.c
--- a/util.c
+++ b/util.c
-@@ -10
22,6 +1022
,32 @@ int handle_partial_dir(const char *fname, int create)
+@@ -10
19,6 +1019
,32 @@ int handle_partial_dir(const char *fname, int create)
return 1;
}
return 1;
}