From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 30 May 2015 09:14:12 +0000 (+0100)
Subject: Merge us:git/staging/rsync-backup
X-Git-Tag: 1.1.0~4
X-Git-Url: https://git.distorted.org.uk/~mdw/rsync-backup/commitdiff_plain/9653f45d4e6e3009f86f912c7bee4441e9ae2b06?hp=-c

Merge us:git/staging/rsync-backup

* us:git/staging/rsync-backup:
  rsync-backup.in, rsync-backup.8: Trim caches on fshash mismatch.
  rsync-backup.in (run): Option to preserve standard input.
  fshash.in, fshash.1: Evict cache entries identified by diff files.

Conflicts:
	fshash.1
---

9653f45d4e6e3009f86f912c7bee4441e9ae2b06
diff --combined fshash.1
index 51580b8,2ceb175..788a7d8
--- a/fshash.1
+++ b/fshash.1
@@@ -16,6 -16,14 +16,14 @@@
  .IR hash ]
  .RI [ file
  \&...]
+ .br
+ .B fshash
+ .RB \-u
+ .B \-c
+ .I cache
+ .RB [ \-H
+ .IR hash ]
+ .RI [ dir ]
  .SH DESCRIPTION
  The
  .B fshash
@@@ -92,8 -100,16 +100,16 @@@ Use th
  .I hash
  function, which can be any hash function supported by Python's
  .BR hashlib .
 -If this option may be omitted then the hash is read from the cache file;
 -if there is no cache file either, then an error is reported.
 +This option may be omitted: if it is, then the hash is read from the
 +cache file; if there is no cache file either, then an error is reported.
+ .TP
+ .B \-u, \-\-udiff
+ Rather than produce a manifest, read a unified
+ .BR diff (1)
+ from standard input, and clear from the cache all files mentioned as
+ being different.  Filenames in the diff are considered relative to
+ .I dir ,
+ defaulting to the current working directory.
  .PP
  Positional arguments are interpreted as files and directories to be
  processed, in order.  A directory name which ends in
@@@ -110,7 -126,6 +126,6 @@@ hexadecimal.  For other kinds of filesy
  object type and any special information about it, in square brackets,
  and padded with spaces so as to take the same width as a hash; see
  below for details.
- as follows.
  .hP 2.
  A `virtual inode identifier': a string which will be the same in two
  lines if and only if they represent hard links to the same underlying
@@@ -177,7 -192,7 +192,7 @@@ The information field show
  .BR symbolic-link .
  The name is followed by
  .RB ` \~\->\~ '
 -and the link target (or by
 +and the link target (or
  .BI <E nn \~ message >
  if there was an error reading the link destination).
  .TP