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
Fixed failing hunks.
[rsync/rsync-patches.git]
/
detect-renamed.diff
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
89ffe14
..
c190b33
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-386,7
+386,7
@@
TODO:
f_name(fp, delbuf);
- if (delete_delay_fp)
+ if (delete_delay_fp && !(flags & DEL_NO_DELETIONS))
f_name(fp, delbuf);
- if (delete_delay_fp)
+ if (delete_delay_fp && !(flags & DEL_NO_DELETIONS))
- fprintf(delete_delay_fp, "%o %s%c", fp->mode, delbuf, '\0');
+ fprintf(delete_delay_fp, "%o %s%c",
(short)
fp->mode, delbuf, '\0');
else
- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
- }
else
- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
- }