diff options
| author | Wayne Davison <wayned@samba.org> | 2012-01-28 11:51:28 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2012-01-28 12:04:26 -0800 |
| commit | b55115ec6f127f7def2dfcc907bf6e28d775e53c (patch) | |
| tree | 172bb39013929b58ab312ab1a72d2d7db2f8c30b /generator.c | |
| parent | f5e2b8f80308bb390da5656db3bf22774c2f371e (diff) | |
| download | android_external_rsync-b55115ec6f127f7def2dfcc907bf6e28d775e53c.tar.gz android_external_rsync-b55115ec6f127f7def2dfcc907bf6e28d775e53c.tar.bz2 android_external_rsync-b55115ec6f127f7def2dfcc907bf6e28d775e53c.zip | |
Fix --only-write-batch hang with --hard-links.
Fixes bug 8565.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/generator.c b/generator.c index c44ba3bb..973e03bd 100644 --- a/generator.c +++ b/generator.c @@ -81,6 +81,7 @@ extern int link_dest; extern int whole_file; extern int list_only; extern int read_batch; +extern int write_batch; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ extern int unsort_ndx; @@ -1813,7 +1814,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, notify_others: if (remove_source_files && !delay_updates && !phase && !dry_run) increment_active_files(ndx, itemizing, code); - if (inc_recurse && !dry_run) + if (inc_recurse && (!dry_run || write_batch < 0)) cur_flist->in_progress++; #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_IS_HLINKED(file)) |