From: Junio C Hamano Date: Mon, 8 Aug 2016 21:48:43 +0000 (-0700) Subject: Merge branch 'jh/clean-smudge-f-doc' X-Git-Tag: v2.10.0-rc0~34 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/104985c59eb5f318daf6732af9a2b7a9f63d0857?hp=ffdcac4bc59a58fd0c4b99ce2d92c828c5b5fcae Merge branch 'jh/clean-smudge-f-doc' A minor documentation update. * jh/clean-smudge-f-doc: clarify %f documentation --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b40068bdfd..34db3e219b 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -377,6 +377,11 @@ substitution. For example: smudge = git-p4-filter --smudge %f ------------------------ +Note that "%f" is the name of the path that is being worked on. Depending +on the version that is being filtered, the corresponding file on disk may +not exist, or may have different contents. So, smudge and clean commands +should not try to access the file on disk, but only act as filters on the +content provided to them on standard input. Interaction between checkin/checkout attributes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^