{"thread":{"id":"16633","subject":"[gitk PATCH 3/3] gitk: allow text-conversion in diffs","startedAt":"2008-12-08T03:00:46Z","lastAt":"2008-12-08T03:00:46Z","messageCount":1,"participants":["Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"97327","messageId":"20081208030046.GC22072@coredump.intra.peff.net","threadId":"16633","inReplyTo":null,"subject":"[gitk PATCH 3/3] gitk: allow text-conversion in diffs","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-12-08T03:00:46Z","receivedAt":"2008-12-08T03:00:46Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"The \"textconv\" feature of git requires explicit enabling in\nplumbing because the resulting diffs are not useful for\nfeeding to \"git-apply\" or \"patch\". Thus any callers should\nmake a conscious choice that they want the human-friendly\nversion.\n\nSince the diffs presented by gitk are meant primarily for\nhuman consumption, and not applying, it makes sense to allow\ntext conversion.\n---\nPaul,\n\nI am cc'ing you only on 3/3 since it is the only gitk patch (the others\nimplement --textconv in git itself). Textconv is basically a feature to\nshow human-readable text diffs of binary files by doing a one-way binary\nto text conversion (and so they can't be applied).\n\nI think gitk would always want to support these; if not, then the\nalternative is a \"diff flags\" option for gitk where the user could\nspecify this flag manually.\n\n gitk |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex a5e24e4..0fb87c7 100755\n--- a/gitk\n+++ b/gitk\n@@ -7198,7 +7198,7 @@ proc getblobdiffs {ids} {\n     global limitdiffs vfilelimit curview\n     global diffencoding targetline diffnparents\n \n-    set cmd [diffcmd $ids \"-p -C --cc --no-commit-id -U$diffcontext\"]\n+    set cmd [diffcmd $ids \"-p -C --cc --no-commit-id -U$diffcontext --textconv\"]\n     if {$ignorespace} {\n \tappend cmd \" -w\"\n     }\n-- \n1.6.1.rc2.285.gc1cf2\n"}]}