[PATCH v2 0/4] clarify %f documentation
- From
Joey Hess <joeyh@joeyh.name>
- Date
- Jun 17, 2016, 22:43 UTC
- Message-ID
- <20160617224345.GA26764@kitenet.net>
- In-Reply-To
- <xmqqshwbzfab.fsf@gitster.mtv.corp.google.com>
It's natural to expect %f to be an actual file on disk; help avoid that mistake.
Signed-off-by: Joey Hess <joeyh@joeyh.name> ---
This patch series was meant to contain 5 patches; here's the missing one. This patch will apply cleanly on top of v2.9.0.
Documentation/gitattributes.txt | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e3b1de8..145dd10 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -374,6 +374,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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-- 2.8.1