Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
clarify %f documentation
author
Joey Hess
<joeyh@joeyh.name>
Mon, 11 Jul 2016 22:45:05 +0000
(18:45 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 3 Aug 2016 17:10:35 +0000
(10:10 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
08df31e
)
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index e3b1de80335e713507875fb54c31c3ba5dab8c9f..145dd10967cd3654fb331b8c5d6a1e3e622ef6ef 100644
(file)
--- a/
Documentation/gitattributes.txt
+++ b/
Documentation/gitattributes.txt
@@
-374,6
+374,11
@@
substitution. For example:
smudge = git-p4-filter --smudge %f
------------------------
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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Interaction between checkin/checkout attributes
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^