From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 19 Jul 2025 18:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 79050@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.175294800713959 (code B ref -1); Sat, 19 Jul 2025 18:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jul 2025 18:00:07 +0000 Received: from localhost ([127.0.0.1]:44327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udBqw-0003d4-68 for submit@debbugs.gnu.org; Sat, 19 Jul 2025 14:00:06 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34342) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udBqr-0003ao-On for submit@debbugs.gnu.org; Sat, 19 Jul 2025 14:00:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udBqe-0003rA-Tm for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2025 13:59:49 -0400 Received: from caracal.ash.relay.mailchannels.net ([23.83.222.30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udBqc-0003kG-W5 for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2025 13:59:48 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id ACAEB323CB0 for ; Sat, 19 Jul 2025 17:59:42 +0000 (UTC) Received: from pdx1-sub0-mail-a202.dreamhost.com (100-114-140-253.trex-nlb.outbound.svc.cluster.local [100.114.140.253]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 54DBE323ADF for ; Sat, 19 Jul 2025 17:59:42 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1752947982; a=rsa-sha256; cv=none; b=8/NEZY53p6n0LChQj/ZN0d6cpQ4lwo52YzQ7AMi3Z1fESX0Sm/TMmDvekQf6oMTjL82e0q NPIj26WavuyeNRiZU9yU6vMN6K6oR/v9K2nvCJOKQF4PjSihJPqSsRPDmBdqojlgYI3EuE 1H/DN5VkD2RILDMKsrYY0QJHWi2pqT/ph6qO10yr2jIa4aiQN4Ia9VwVqhepmp65vALjNm d/eJuGhBkY7wEKGTz7Ot6VqwOhp+EHDpeZLNFHk3hicJneaJO+qoUBr7NsDYycJ9NO3B2V szYIEbyrhDtYDiVFAlBzk4yizpFYOCsQPlO6Z3ysyTmZ7CgZxTse3Brd0we5nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1752947982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=L3+qWm6Av4mYVDgEa7quSpNbGQl1p63iiNK4xb4Auvg=; b=hZmUlVwED5eI+et3PBr9zf8d0Zv25QKd7WIClh93LaTaLub/1ZEVgZfFXsTt0lnJC1xW4h v52V+N4UXgEzHrmQfXzMZ67g6OVxjJgANVPXt/u95WpN9QMpve1NY9tZGp3PyGdI1MYG5O Vh8w2ZOppey/gJf7NgJlcpMr5TIV8/bDpU3zxChv3Exv5dZIJy/IQGDisK+YJJdEnYUofe NgUzQpuTuTHaWZL/QqiDATsJucyNQK6BkTDQzQUJc4N9yEvum/++Ib7IXhlRT+a7j1RgHr 7z1tSedoVXzD8yzq2QzBhOlyfg55/v7iVHfDm2Y0AnYFAP+Juv5sZ74b9OZGCA== ARC-Authentication-Results: i=1; rspamd-7df5bc8bc6-5kgbx; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Ruddy-Decisive: 49b02c0a012011c1_1752947982555_595820652 X-MC-Loop-Signature: 1752947982555:2667054935 X-MC-Ingress-Time: 1752947982554 Received: from pdx1-sub0-mail-a202.dreamhost.com (sub5.mail.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.114.140.253 (trex/7.1.3); Sat, 19 Jul 2025 17:59:42 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a202.dreamhost.com (Postfix) with ESMTPSA id 4bkvZ60Dl9zM5 for ; Sat, 19 Jul 2025 10:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1752947982; bh=L3+qWm6Av4mYVDgEa7quSpNbGQl1p63iiNK4xb4Auvg=; h=Date:To:From:Subject:Content-Type:Content-Transfer-Encoding; b=NIndaQCtd81D7NPk3jnB+ZzcoLGbzmcnJAuoLt5Ja3Km5IXA5HlnhJdN6g/bwCN6J 1muUrhHCnVCRsdNmTuylC125mMbkNk+qdo4fU5cr/LPJHA4QN2GBlx+BW+EY8icJt6 FLB38sYp2Bj124jZeCSHDrnEFHGINC2y69Vkd3tPjTQfK4Qg2zV+Hyw5w6l3NsmRIj Ot1u164VIVO8OQgPhjeRs+YXQjAxXCwFfRMZFOwtaekFsg5hkJabTc/BkQ5th2MeQH TBWSjoHTwXlIg2MtgUWINgb3RUj76qBW0dfdF2akIU+Zyu6ecwbjJEqRwteSOUOz37 tdGaPwA0xBT0w== Message-ID: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> Date: Sat, 19 Jul 2025 13:59:40 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: James Cherti Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=23.83.222.30; envelope-from=contact@jamescherti.com; helo=caracal.ash.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) When using vc-diff in a Git repository where all files are encrypted with git-crypt https://github.com/AGWA/git-crypt the output does not reflect actual changes. Modified files appear unaltered, regardless of edits made. (vc-diff appears to compare the encrypted binary representations of the files, rather than their decrypted contents.) It appears that vc-diff does not take .gitattributes into account, even though Git itself uses it to determine how to handle diff filters. As a result, while git diff correctly shows textual diffs for git-crypt encrypted files (once the repository is unlocked), Emacs vc-diff treats them as binary and fails to display the actual changes. Instead of showing a textual diff, vc-diff reports: diff --git a/file b/file index a134576..8b24729 100644 Binary files a/file and b/file differ Steps to Reproduce: ------------------- 1. Initialize a Git repository and enable git-crypt. Create the repo: ---------------- mkdir -p repo cd repo git init git-crypt init echo test > README.md Create the .gitattributes file: ------------------------------- ** filter=git-crypt diff=git-crypt .gitattributes !filter !diff Commit: ------- git add . git commit -m 'Init' 2. Open the README.md file in Emacs and modify it. 3. Run: M-x vc-diff Expected Behavior ----------------- vc-diff should display a textual diff showing the modified lines. Actual Behavior --------------- vc-diff reports the file as a binary difference with no line-level changes, even though the repository is unlocked and git diff in the terminal shows the correct diff. Environment: ------------ - Emacs version: 31 (3b2bfdfef63f051a36f4043c32596458ccae605f) 2025-07-19 13:05:05 +0300 - OS: Arch Linux -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Jul 2025 10:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: James Cherti Cc: 79050@debbugs.gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175300834312494 (code B ref 79050); Sun, 20 Jul 2025 10:46:01 +0000 Received: (at 79050) by debbugs.gnu.org; 20 Jul 2025 10:45:43 +0000 Received: from localhost ([127.0.0.1]:49038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udRY6-0003FR-NU for submit@debbugs.gnu.org; Sun, 20 Jul 2025 06:45:43 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:43074) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udRY4-0003Ez-1V for 79050@debbugs.gnu.org; Sun, 20 Jul 2025 06:45:40 -0400 DKIM-Signature: a=rsa-sha256; b=nxvmDxv4zEedSKbNXjQkKTacRfRCIQTMYfDwO+NkZeIykGb1zV7EvDrzoA0NuVhq03ndpOhSZvktBnzrvGdMcZBlwmC9CqNkGEA5f2Uu/W4eulYoJP5PqNXBH70RBEBbwV8XfVTtnYaa7TDD4tOUuoAbLYHLDv9Kjl9L6kl1ixljdy8MHuyXOm3A2KeD7kYFab2pnbY0zOQeorNM4C3ltMqR8MYI86BM6PB3sREQKy4qS9ULw+tSPC72rPaHNLF4YXj7Tdh3hzS/tAW3B5lSBhnSjl9ACaT0iAQ76zuGp0NylY9MO231DXzduknynce1FzzFzOdKvSLnvCdMOmYAFw==; s=purelymail1; d=spwhitton.name; v=1; bh=pTHrsItdmCiCfCFp8utv9b3M12FseryJ/LlddoLXa20=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=ZffF0LHkQn4zl+ZxMa63ay6ndBcYCI6hagvxxzzk/b/BE5omBMHA4KEPpKZy8QRLhFGF5QxM2r6+ddxK+mMxMy87/FDAhLEKGCmNt4Vc/2ewRfrFW2PCk8Q0uHNR4HuNJIdS8l3IQXIIIdB3mwbM+K8vl2F18AgyGzRl+3zu/rb7YWqGMCmnzyRLvDSsmEItUf3TOZTAHUqnfTXNFN3cMtycZfHgk+t4q7uHtwHJRd/zLIT/k/qis+uQXP2zG6I8wIkRz8aO39mKvNYlJC/dPPVMf2G+0cDScHGWoWQIzJNPfSfeqeVCFzUJvJ43o4WVpZ72Oo3YiJ8J3PhWQVI2ew==; s=purelymail1; d=purelymail.com; v=1; bh=pTHrsItdmCiCfCFp8utv9b3M12FseryJ/LlddoLXa20=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 1542510565; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 20 Jul 2025 10:45:33 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id A4430940CAA; Sun, 20 Jul 2025 11:45:32 +0100 (BST) From: Sean Whitton In-Reply-To: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> Date: Sun, 20 Jul 2025 11:45:32 +0100 Message-ID: <87o6tfuomr.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello James, Is this enough to fix it? --8<---------------cut here---------------start------------->8--- diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f462fb1959f..9d351797bef 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1829,7 +1829,7 @@ vc-git-diff (if async 'async 1) files command - "--exit-code" + "--exit-code" "--textconv" (append (vc-switches 'git 'diff) (list "-p" (or rev1 "HEAD") rev2 "--"))) (vc-git-command (or buffer "*vc-diff*") 1 files --8<---------------cut here---------------end--------------->8--- -- Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Jul 2025 18:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton Cc: 79050@debbugs.gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175303610826180 (code B ref 79050); Sun, 20 Jul 2025 18:29:02 +0000 Received: (at 79050) by debbugs.gnu.org; 20 Jul 2025 18:28:28 +0000 Received: from localhost ([127.0.0.1]:51679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udYlv-0006o9-Mq for submit@debbugs.gnu.org; Sun, 20 Jul 2025 14:28:28 -0400 Received: from shrimp.cherry.relay.mailchannels.net ([23.83.223.164]:56459) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udYlt-0006np-1a for 79050@debbugs.gnu.org; Sun, 20 Jul 2025 14:28:26 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 86ADC162EF9; Sun, 20 Jul 2025 18:28:23 +0000 (UTC) Received: from pdx1-sub0-mail-a263.dreamhost.com (trex-blue-1.trex.outbound.svc.cluster.local [100.120.34.94]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 322B5162FCB; Sun, 20 Jul 2025 18:28:23 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1753036103; a=rsa-sha256; cv=none; b=PWFAr/Nqd89nUO+bhNcKllFcTpyyDVUgP72KKMBICcDkEjOcu9gALdy/EJCsQoAjt2Ffj+ ym+XYYrz+PFovTiCh0ZWvwXpze1ohYt/vjdWEl/6df6OHB5Yut1bqnWDQjWt0G+XruBU62 0MjzFmZiX1RPBhUESf3u8k5jOCGVesvSYKQxH+4nPgbuiS/3hYc+h9lHZnr0KgcXtjm129 piYlG3FlEuE1FOm5rlXyXrTyOWZN5swJAhXNZlAUKipKTlfzAwhXtTGjyAA8V7MWBfcniS JtafA++UjHMTD2FtpMMpfO7QPIh1LiH7RpRZNK1I5YnKcAAPhw09Jc719TOBlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1753036103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mdTD94bXaW87sXOvoe1IGbkV4CD3p+gkW7+dA3ft5pU=; b=k+sPyl5WJahc429kND3bO+R+VgBuEa45/dqBd8jXoCwdn2+yEewarLm42b56DSJhos6Xq9 aojpS12vRNGodZRzMR8SKHMN3B+77vgF9l0ZygfQfIzbuqtlsbhy29nEd8LQabirbsy90X 1wZ39gP0fxjYvZ8js+HKYdB2Z+tcVGBkxKAF6KhJmaZDdCt5DBy7O7MVXWI1WFFP+s2+IL mYekfs+PsAWgiB0f+w9YGz6hMpUCS77xf2W82KfhnFenMGLE0nvRksDYyjJlYtJDFYPqnb BysN6354QA99n5a4IwltDCEqacsCE7ysWYMfENwssnooeAU8niQI1g+iPxlCEg== ARC-Authentication-Results: i=1; rspamd-7d4d75f7cc-mlhkk; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Hook-Arch: 27a5346a52c48b00_1753036103413_3983198152 X-MC-Loop-Signature: 1753036103413:589415112 X-MC-Ingress-Time: 1753036103413 Received: from pdx1-sub0-mail-a263.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.34.94 (trex/7.1.3); Sun, 20 Jul 2025 18:28:23 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a263.dreamhost.com (Postfix) with ESMTPSA id 4blX8k3j07zDy; Sun, 20 Jul 2025 11:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753036103; bh=mdTD94bXaW87sXOvoe1IGbkV4CD3p+gkW7+dA3ft5pU=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=LoXTj5zojR87e8nGQ0MxlHkzrQ2E4UNcsM+nMDpEY/yGSBJnOsuOquduYpHW/B21N 0DiMg8qKZAJVhIy7J029cAiseCnMNGOvUVmRXykRkLDVdtxnN6HVbOSYDGc90xbwNW yY0tNqvWvNvtz8y38RWc7d4Wvt5ix4yp5r5EW1nyo9Mvll44/RMsz0BsXC2imOI39x cOZlos0k0QGNTfcpnlfuoUKm6yroEoNPdRHwMebHn074jYKA5zJwVIMeeqDx7Kl91B E+KkfU5ILmMp1fGGePJSveKsXep7sAKXpNrGcDoEnNk/94kbU1+ZkG91DRBnHhm8EP 47pXjYL0985HQ== Message-ID: <4bcfe62a-24fc-484c-92f0-29ef110d00b5@jamescherti.com> Date: Sun, 20 Jul 2025 14:28:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87o6tfuomr.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Sean, Yes, adding `--textconv` resolves the issue. -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ On 2025-07-20 06:45, Sean Whitton wrote: > Hello James, > > Is this enough to fix it? > > --8<---------------cut here---------------start------------->8--- > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index f462fb1959f..9d351797bef 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1829,7 +1829,7 @@ vc-git-diff > (if async 'async 1) > files > command > - "--exit-code" > + "--exit-code" "--textconv" > (append (vc-switches 'git 'diff) > (list "-p" (or rev1 "HEAD") rev2 "--"))) > (vc-git-command (or buffer "*vc-diff*") 1 files > --8<---------------cut here---------------end--------------->8--- > From unknown Thu Aug 14 22:25:02 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: James Cherti Subject: bug#79050: closed (Re: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked) Message-ID: References: <87cy9ut0d9.fsf@zephyr.silentflame.com> <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> X-Gnu-PR-Message: they-closed 79050 X-Gnu-PR-Package: emacs Reply-To: 79050@debbugs.gnu.org Date: Mon, 21 Jul 2025 08:28:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1753086482-5520-1" This is a multi-part message in MIME format... ------------=_1753086482-5520-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #79050: vc-git incorrectly treats git-crypt encrypted files as binary, even= when unlocked which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 79050@debbugs.gnu.org. --=20 79050: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D79050 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1753086482-5520-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 79050-done) by debbugs.gnu.org; 21 Jul 2025 08:27:26 +0000 Received: from localhost ([127.0.0.1]:55145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udlrq-0001P3-HN for submit@debbugs.gnu.org; Mon, 21 Jul 2025 04:27:26 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:49570) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udlrn-0001OU-1e for 79050-done@debbugs.gnu.org; Mon, 21 Jul 2025 04:27:24 -0400 DKIM-Signature: a=rsa-sha256; b=ojyCBfSIW0r9nXWSLAEb0aHnV5IYhAZygOHNZKO3iii5v+jonNRJEjtd5pcBn7uzYkqguRbZYf3OD1l/0BgZ3+bvNIW14vf4EY/OPilHcsvkP/eVLnw4o+8fN3j9c/dB6rdQc6TBbtqvVOBbiMzIaWcByONRaIc8ob7SxWM9o4bi4kjUWgnBNzRgSfyPeFI+WX4NOlDYiNjFQBT2HFQuZeEwlzwX+m+d+nWIZZaK16RXfM9Qdnbi+YEa/K6UOASQtz6Dh0Lt2PwYBit3Id55HSwz0DA4SH1N7ByGnC4InTu+LcBCHMNHA6WbF4jMXfy5z/wl+CQe1Yp0x99mxcwTSQ==; s=purelymail1; d=spwhitton.name; v=1; bh=UmXzOVE4uMNN7NHD4fNqMj4NEYNKDIPbJp4q8V9qx+s=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=hz6uzcHEEEyjrt09y07bXl0mk8c3GOcODaN3qAmVI91wGviKS6MNF57LFbkrF3IVcTx7PaxISM4GS0DMXZyI3cS+4CnFTR8/d23x9BYdoU0hM/zRcI/I6oCdjj0NlxgCBSqScoaJIe2w31qq4kPt8vJ07oJFyVJz9yfEggv4G25fzb5kmhzuDfBciBwdrhUuyjqAEEJe+0foiamusOt6dSNdkTYQPJkAoLclzrzox75WP8eV2qBrDzEm48L4reZZRSwbv6RMLCTkYVjRmOJTRRU7M/wqAnAc6EZM4DOqAC8DN4TuAjts14RG7kfO/RVe9TLAV/47kwku/lM31Ze7iQ==; s=purelymail1; d=purelymail.com; v=1; bh=UmXzOVE4uMNN7NHD4fNqMj4NEYNKDIPbJp4q8V9qx+s=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050-done@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -833342987; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Mon, 21 Jul 2025 08:27:16 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 17FE4940188; Mon, 21 Jul 2025 09:27:14 +0100 (BST) From: Sean Whitton To: James Cherti Subject: Re: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked In-Reply-To: <4bcfe62a-24fc-484c-92f0-29ef110d00b5@jamescherti.com> References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <4bcfe62a-24fc-484c-92f0-29ef110d00b5@jamescherti.com> Date: Mon, 21 Jul 2025 09:27:14 +0100 Message-ID: <87cy9ut0d9.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 79050-done Cc: 79050-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.0 (--) Version: 31.1 Hello, On Sun 20 Jul 2025 at 02:28pm -04, James Cherti wrote: > Hello Sean, > > Yes, adding `--textconv` resolves the issue. Thanks for testing. Installed that change, and closing the bug. -- Sean Whitton ------------=_1753086482-5520-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 19 Jul 2025 18:00:07 +0000 Received: from localhost ([127.0.0.1]:44327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udBqw-0003d4-68 for submit@debbugs.gnu.org; Sat, 19 Jul 2025 14:00:06 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34342) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udBqr-0003ao-On for submit@debbugs.gnu.org; Sat, 19 Jul 2025 14:00:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udBqe-0003rA-Tm for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2025 13:59:49 -0400 Received: from caracal.ash.relay.mailchannels.net ([23.83.222.30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1udBqc-0003kG-W5 for bug-gnu-emacs@gnu.org; Sat, 19 Jul 2025 13:59:48 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id ACAEB323CB0 for ; Sat, 19 Jul 2025 17:59:42 +0000 (UTC) Received: from pdx1-sub0-mail-a202.dreamhost.com (100-114-140-253.trex-nlb.outbound.svc.cluster.local [100.114.140.253]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 54DBE323ADF for ; Sat, 19 Jul 2025 17:59:42 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1752947982; a=rsa-sha256; cv=none; b=8/NEZY53p6n0LChQj/ZN0d6cpQ4lwo52YzQ7AMi3Z1fESX0Sm/TMmDvekQf6oMTjL82e0q NPIj26WavuyeNRiZU9yU6vMN6K6oR/v9K2nvCJOKQF4PjSihJPqSsRPDmBdqojlgYI3EuE 1H/DN5VkD2RILDMKsrYY0QJHWi2pqT/ph6qO10yr2jIa4aiQN4Ia9VwVqhepmp65vALjNm d/eJuGhBkY7wEKGTz7Ot6VqwOhp+EHDpeZLNFHk3hicJneaJO+qoUBr7NsDYycJ9NO3B2V szYIEbyrhDtYDiVFAlBzk4yizpFYOCsQPlO6Z3ysyTmZ7CgZxTse3Brd0we5nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1752947982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=L3+qWm6Av4mYVDgEa7quSpNbGQl1p63iiNK4xb4Auvg=; b=hZmUlVwED5eI+et3PBr9zf8d0Zv25QKd7WIClh93LaTaLub/1ZEVgZfFXsTt0lnJC1xW4h v52V+N4UXgEzHrmQfXzMZ67g6OVxjJgANVPXt/u95WpN9QMpve1NY9tZGp3PyGdI1MYG5O Vh8w2ZOppey/gJf7NgJlcpMr5TIV8/bDpU3zxChv3Exv5dZIJy/IQGDisK+YJJdEnYUofe NgUzQpuTuTHaWZL/QqiDATsJucyNQK6BkTDQzQUJc4N9yEvum/++Ib7IXhlRT+a7j1RgHr 7z1tSedoVXzD8yzq2QzBhOlyfg55/v7iVHfDm2Y0AnYFAP+Juv5sZ74b9OZGCA== ARC-Authentication-Results: i=1; rspamd-7df5bc8bc6-5kgbx; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Ruddy-Decisive: 49b02c0a012011c1_1752947982555_595820652 X-MC-Loop-Signature: 1752947982555:2667054935 X-MC-Ingress-Time: 1752947982554 Received: from pdx1-sub0-mail-a202.dreamhost.com (sub5.mail.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.114.140.253 (trex/7.1.3); Sat, 19 Jul 2025 17:59:42 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a202.dreamhost.com (Postfix) with ESMTPSA id 4bkvZ60Dl9zM5 for ; Sat, 19 Jul 2025 10:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1752947982; bh=L3+qWm6Av4mYVDgEa7quSpNbGQl1p63iiNK4xb4Auvg=; h=Date:To:From:Subject:Content-Type:Content-Transfer-Encoding; b=NIndaQCtd81D7NPk3jnB+ZzcoLGbzmcnJAuoLt5Ja3Km5IXA5HlnhJdN6g/bwCN6J 1muUrhHCnVCRsdNmTuylC125mMbkNk+qdo4fU5cr/LPJHA4QN2GBlx+BW+EY8icJt6 FLB38sYp2Bj124jZeCSHDrnEFHGINC2y69Vkd3tPjTQfK4Qg2zV+Hyw5w6l3NsmRIj Ot1u164VIVO8OQgPhjeRs+YXQjAxXCwFfRMZFOwtaekFsg5hkJabTc/BkQ5th2MeQH TBWSjoHTwXlIg2MtgUWINgb3RUj76qBW0dfdF2akIU+Zyu6ecwbjJEqRwteSOUOz37 tdGaPwA0xBT0w== Message-ID: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> Date: Sat, 19 Jul 2025 13:59:40 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: bug-gnu-emacs@gnu.org From: James Cherti Subject: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=23.83.222.30; envelope-from=contact@jamescherti.com; helo=caracal.ash.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) When using vc-diff in a Git repository where all files are encrypted with git-crypt https://github.com/AGWA/git-crypt the output does not reflect actual changes. Modified files appear unaltered, regardless of edits made. (vc-diff appears to compare the encrypted binary representations of the files, rather than their decrypted contents.) It appears that vc-diff does not take .gitattributes into account, even though Git itself uses it to determine how to handle diff filters. As a result, while git diff correctly shows textual diffs for git-crypt encrypted files (once the repository is unlocked), Emacs vc-diff treats them as binary and fails to display the actual changes. Instead of showing a textual diff, vc-diff reports: diff --git a/file b/file index a134576..8b24729 100644 Binary files a/file and b/file differ Steps to Reproduce: ------------------- 1. Initialize a Git repository and enable git-crypt. Create the repo: ---------------- mkdir -p repo cd repo git init git-crypt init echo test > README.md Create the .gitattributes file: ------------------------------- ** filter=git-crypt diff=git-crypt .gitattributes !filter !diff Commit: ------- git add . git commit -m 'Init' 2. Open the README.md file in Emacs and modify it. 3. Run: M-x vc-diff Expected Behavior ----------------- vc-diff should display a textual diff showing the modified lines. Actual Behavior --------------- vc-diff reports the file as a binary difference with no line-level changes, even though the repository is unlocked and git diff in the terminal shows the correct diff. Environment: ------------ - Emacs version: 31 (3b2bfdfef63f051a36f4043c32596458ccae605f) 2025-07-19 13:05:05 +0300 - OS: Arch Linux -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ ------------=_1753086482-5520-1-- From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Jul 2025 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 79050@debbugs.gnu.org, spwhitton@spwhitton.name Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.1753112227538 (code B ref 79050); Mon, 21 Jul 2025 15:38:02 +0000 Received: (at 79050) by debbugs.gnu.org; 21 Jul 2025 15:37:07 +0000 Received: from localhost ([127.0.0.1]:58118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1udsZf-00008Z-BX for submit@debbugs.gnu.org; Mon, 21 Jul 2025 11:37:07 -0400 Received: from silver.cherry.relay.mailchannels.net ([23.83.223.166]:4787) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1udsZc-00007e-Ek for 79050@debbugs.gnu.org; Mon, 21 Jul 2025 11:37:05 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 0064A83AAA; Mon, 21 Jul 2025 15:37:02 +0000 (UTC) Received: from pdx1-sub0-mail-a272.dreamhost.com (trex-blue-0.trex.outbound.svc.cluster.local [100.114.140.254]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5F4E683975; Mon, 21 Jul 2025 15:37:01 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1753112221; a=rsa-sha256; cv=none; b=BBnrJNprcxZyxtjRgr2HEC65LirqhJxDgBqfmrAE//sDHCh62gva5hKQ5Fy+BDFxxlt+yB hTV2Vrr7tZjJYWfNkzbWMUIXkqrzSQ70EkuFNM9CLmNa1loYIhZLj1KrkGQk6R1KTGVCXs K45GF8hrXsDzYHjfCEPL/Y1xuWOjLjVMnAIEx7Fw4xf4g+PkVdodJeoBsGGHF7/FvmS+jN hds2rV71VD3/V89IE9ZJ5TWbvMuxvZorEA0IYS58GLQfzNjhOglLvqYohyDsmCXJJ+0IlX PswILc+eTgEVu2bRFliXxKmantAzm7SFNUl1HtJSzectC/AphNTBx9scr06EdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1753112221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/HFhRTYpAKI7fkFdmn5hLCa3QCwi7546V252s+Q9WXE=; b=PyozY5ylcnYBugzIXbLE8fCZU2n5TrhrpQ012/mMBKQif/RxmneSIcy02b0Irv734kRHKV ZKp4XqSnkVI4CmyhIAx1W6myf/bETCwOtRw9JUZSKag49vrLdmJ+4VC+kH0xXsLj/q8lWS /4tUOk5mg2PAvQscFe0IN2pBVa3HLUS0u3hlsInrley3YjeBweeNWdxciUYp9jo+XUeYey PDiQ0f4Ghy4f1K0zD1vkmgD5GktjWuoBxoBqSw1l0UtSVBoMdzUP3/1Ys5R9vUvlFbnaI3 Y1n3OYjk+voUnABPKP5XeoC45p5o1GOHVXb9a3VyYLsE4ITtjUx3pTnnkKQnqw== ARC-Authentication-Results: i=1; rspamd-7df5bc8bc6-d9gj4; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Thread-Skirt: 5e0745e53e4225d3_1753112221810_932918757 X-MC-Loop-Signature: 1753112221809:19412033 X-MC-Ingress-Time: 1753112221809 Received: from pdx1-sub0-mail-a272.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.114.140.254 (trex/7.1.3); Mon, 21 Jul 2025 15:37:01 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a272.dreamhost.com (Postfix) with ESMTPSA id 4bm4JX5m1NzSV; Mon, 21 Jul 2025 08:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753112221; bh=/HFhRTYpAKI7fkFdmn5hLCa3QCwi7546V252s+Q9WXE=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=Qn2wLS1L64LGZk0AOqR8Lfmo5WbspjabfqRiXE8MxoRR5+YGuloprHzujx/BQpuqL nYFH9QbGiE73KHbXpQETQm7Spq6Zw6VRZTIabs7F4RE1yKkwigNfYcfWkUgwrc+AjM c+y7PDGMniAWXAD9aRUIJdypMnQw5mr9nJd6RnA4hO+UodoFnXpxg70/2SJWRmfikv PO9Y0Kcy9rIMsljcRAG+wdWByZPjZ19LVUmUwimpnv43ujoA1yMcahoPHxOsB1gK5C CfrZCeM01K7lL+XFThptm4zd8MjaHEDN0hbBcpVtgxEXBf6no619OL9Aeq6STvf4Ae //RV+D5mkF1cA== Message-ID: <0922e418-8ae3-4f5f-b537-338625a64286@jamescherti.com> Date: Mon, 21 Jul 2025 11:36:59 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <4bcfe62a-24fc-484c-92f0-29ef110d00b5@jamescherti.com> <87cy9ut0d9.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87cy9ut0d9.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thank you for resolving this issue promptly, Sean. I have tested your fix, and it functions as expected. -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ On 2025-07-21 04:27, Sean Whitton wrote: > Version: 31.1 > > Hello, > > On Sun 20 Jul 2025 at 02:28pm -04, James Cherti wrote: > >> Hello Sean, >> >> Yes, adding `--textconv` resolves the issue. > > Thanks for testing. Installed that change, and closing the bug. > From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Jul 2025 06:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Sean Whitton Cc: 79050@debbugs.gnu.org, James Cherti Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175316716920618 (code B ref 79050); Tue, 22 Jul 2025 06:53:02 +0000 Received: (at 79050) by debbugs.gnu.org; 22 Jul 2025 06:52:49 +0000 Received: from localhost ([127.0.0.1]:34103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ue6ro-0005MJ-4a for submit@debbugs.gnu.org; Tue, 22 Jul 2025 02:52:48 -0400 Received: from mout-y-209.mailbox.org ([2001:67c:2050:103:465::209]:35282) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ue6rm-0005LL-RZ for 79050@debbugs.gnu.org; Tue, 22 Jul 2025 02:52:47 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-y-209.mailbox.org (Postfix) with ESMTPS id 4bmScz3Db1zB0T0; Tue, 22 Jul 2025 08:52:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linkov.net; s=MBO0001; t=1753167155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9nmXnzG+/xYtfee8L2QyJM+l6qppLYvNaRuQ6ZcmPo0=; b=QV/DHEBPw5oisQxlqHN9OjPlTQAe9UNE6CQGH84daql/pcx2vj2UYZqagOdnAYpciLQjNh g43XPMUquru3KaYMWzvNGaJffV/diemarBd9XW6sWEOG9RDzP5yzAA7G9/27QJRDeF4+KA RFXZ7HZv3Uti+czy7d255bl4rGUd6c6E7UNEacW3do39aaegdokDIGxGIstd4wFUdcBJ0S dNVBF/bkPMYq80HoO66mwg9F3ChRFDx9O9GuPg8vjMi8R5ma9Ifr8mKG7NdEcU7D4WDlu6 sYbkVokhv00Pn8zdMyu2vble4OFplPGrf7qu3FRJwN0nP69q0sFGMKE6KNenqA== From: Juri Linkov In-Reply-To: <87o6tfuomr.fsf@zephyr.silentflame.com> Organization: LINKOV.NET References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> Date: Tue, 22 Jul 2025 09:45:09 +0300 Message-ID: <87tt34bun6.fsf@mail.linkov.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > Is this enough to fix it? > > @@ -1829,7 +1829,7 @@ vc-git-diff > (if async 'async 1) > files > command > - "--exit-code" > + "--exit-code" "--textconv" Thanks for adding "--textconv". Before this change I used (with-eval-after-load 'vc-git (add-to-list 'vc-git-diff-switches "--textconv" t)) that worked on `git diff` but failed on `git diff-index` with (error "Failed (status 128): git diff-index --textconv -p 1234567890 -- .") But maybe this was in an old git version since it's not reproducible now. Also I remember a minor inconvenience that "--textconv" makes `git diff` too slow on encrypted files. Most of the time there is no need to see decrypted text in diff output. So I prefered to add "--textconv" only occasionally: mostly to verify the encrypted content before committing changes, but not when viewing logs with diff. Would it be possible to enable this optionally? Maybe a simple variable would suffice. From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Jul 2025 10:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juri Linkov Cc: control@debbugs.gnu.org, 79050@debbugs.gnu.org, James Cherti Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175318059325722 (code B ref 79050); Tue, 22 Jul 2025 10:37:01 +0000 Received: (at 79050) by debbugs.gnu.org; 22 Jul 2025 10:36:33 +0000 Received: from localhost ([127.0.0.1]:35383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueAML-0006go-Bz for submit@debbugs.gnu.org; Tue, 22 Jul 2025 06:36:33 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:48048) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueAMI-0006gE-4e for 79050@debbugs.gnu.org; Tue, 22 Jul 2025 06:36:31 -0400 DKIM-Signature: a=rsa-sha256; b=NkdTIp+O1sMCBUHLP6iv7FOv8h1dnt7pdMVexlfAAqHvr1t0Q0AOqCLahL7e/3O264cmkxrB7OOq9LYklbKwJgQlQw2jMGLud5WtMuyBuRWRrGTcLbNboybfRMWUu5HdMF7Sm7hHisIERtooM7uRRZzXJDh0sxrV0zuIajdzVdwinHepp8Y6MsbLAmuAoN2nFUvK4GJaAvbNUQYT2aIA6JMt/Se+LJHBy4ILAO4tamMTdIns2FNezNmgxDfvSy+jfE/kdMHpqrCj9P36XhkZYW+Pbo9TIUmcb06dSqk/qZYvcetd8vjTX84ZzssXHp29TvKRHtvgPJS+4GlqLV24wA==; s=purelymail1; d=spwhitton.name; v=1; bh=mU5gKNRBPUgFtTzgiIIZaHASALa/uhcZxFZMtmrEv/0=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=SRgFBWhdVuO4M59ZUU43xsWxP1Js/eZ2s0syl7+e90ApEf7NkY3J9AZUN82XgH/MdO6PyQP1GLu1uJTdmQxWWAkyJgrBx/ivqJaM/PCEKPBYb/gUHsJPmUyfmzs6tOORDFf8ccOe/3XX+HJUV+1PsfkJ8otH3DDiDieru957B5RPxPx3WbmTyYrA85Y/TVR7P2D26gRaf5/vKChXCXcY0Oq9i/lqZW7iUpyzixiv55kJLWIS03b/v7bhvAZ5d0A1kr/3xzcqU2V5Yl3Y5nNquVSTjg1YzJMB1hAzqlfUNoC8sbcpFuW9iHc3/fLlC4C/yZkJEddT93dr57ms9GOFLw==; s=purelymail1; d=purelymail.com; v=1; bh=mU5gKNRBPUgFtTzgiIIZaHASALa/uhcZxFZMtmrEv/0=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1774302977; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 22 Jul 2025 10:36:22 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 1C7969401CA; Tue, 22 Jul 2025 11:36:20 +0100 (BST) From: Sean Whitton In-Reply-To: <87tt34bun6.fsf@mail.linkov.net> References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> Date: Tue, 22 Jul 2025 11:36:20 +0100 Message-ID: <87y0sgpl5n.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tag 79050 + notabug notfixed 79050 31.1 thanks Hello, On Tue 22 Jul 2025 at 09:45am +03, Juri Linkov wrote: > Also I remember a minor inconvenience that "--textconv" makes `git diff` > too slow on encrypted files. Most of the time there is no need > to see decrypted text in diff output. So I prefered to add "--textconv" > only occasionally: mostly to verify the encrypted content before committing > changes, but not when viewing logs with diff. Interesting. > Would it be possible to enable this optionally? > Maybe a simple variable would suffice. Another problem is that you can't commit changes from *vc-diff* buffers with --textconv, and if you try to do so anyway, it might break things in your repository, without you realising. Therefore I think that users should have to add this to vc-git-diff-switches themselves if they want this. I'll revert the change. -- Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Jul 2025 13:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton , Juri Linkov Cc: control@debbugs.gnu.org, 79050@debbugs.gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17531908321177 (code B ref 79050); Tue, 22 Jul 2025 13:28:03 +0000 Received: (at 79050) by debbugs.gnu.org; 22 Jul 2025 13:27:12 +0000 Received: from localhost ([127.0.0.1]:36442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueD1T-0000It-D5 for submit@debbugs.gnu.org; Tue, 22 Jul 2025 09:27:11 -0400 Received: from dwarf.ash.relay.mailchannels.net ([23.83.222.53]:10743) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueD1Q-0000IT-OX; Tue, 22 Jul 2025 09:27:09 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 373D21C2E87; Tue, 22 Jul 2025 13:27:06 +0000 (UTC) Received: from pdx1-sub0-mail-a242.dreamhost.com (100-114-140-253.trex-nlb.outbound.svc.cluster.local [100.114.140.253]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id E8DBF1C264E; Tue, 22 Jul 2025 13:27:04 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1753190824; a=rsa-sha256; cv=none; b=tFtTBguglWQBsWDd0+zjkHGMz9SArYF4irEs+G8wddtjwqYNE7FXg0hNBe8toBES84YAJf 7weop3liWx/vDGrEyx1L8WVkXHmmCrK4W/rCfDo8SYuLDf6ZvLjOVVl9Jae/AI5nqVPUO8 Abkbp1tHqXhnqd2XN+Fgw3wPfbcmqsPqIFjU/cIVCzAb2pBCSGRZo7a332QODKyJoaq51R tB3bZcTXbAIw+ylo0t8rzifZ5N4yc1gjGbl3bFVEwxVCsj/BGqL1UV49wzLQdL5enQoX9I Usyi30/WNrxm4bgRxn6dmQNiBtPpJyp55mk/nQhkC7tMqENEJaMsm1xjToepgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1753190824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1U91jUjraUWlNEw0si0bzLqxXJGUpO5CzILRwI+WW1g=; b=wzmXJlp1lHBudnJqlW4+bcwtVNkzc4AfWftFo6e6ZnAdYDQdK5EF2+7L7fuw/+S/GIOB/s Y7eVwCvaikeTIq9rT4y8z2iB0qW45lkM0i3cLqfZdOroEkaqgqTg+cJmHxW6jOPW+MkT0Z kBC89FV+HbJjUKtD+gCQ6DCu/6P8LS6ciuuVSdi0wsKmk9JDUfWG5f9XdmQGoPrE2vxW8A lKin26YExGpOwn0ILHb+LTRr9u0B1ihJG8b7droZuLL5CDBJBSSRPOztGhi0Hh89zuq23y yaMhojA6T1rXUXH9MOAJvRYAh9odYjWjzNq1bnNNNLLcZ/Sp5yHmoij6TyiNCA== ARC-Authentication-Results: i=1; rspamd-7df5bc8bc6-pdbrn; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Desert-Callous: 029e78fd395276e8_1753190826086_3075618888 X-MC-Loop-Signature: 1753190826086:1786903546 X-MC-Ingress-Time: 1753190826086 Received: from pdx1-sub0-mail-a242.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.114.140.253 (trex/7.1.3); Tue, 22 Jul 2025 13:27:06 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a242.dreamhost.com (Postfix) with ESMTPSA id 4bmdN83LlVz2Q; Tue, 22 Jul 2025 06:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753190824; bh=1U91jUjraUWlNEw0si0bzLqxXJGUpO5CzILRwI+WW1g=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=XepoIl067tAZJY1mPCM6TbVmjZ8zNXhEyll6i5ZwYp8DtK3xIsz/PjVpDyEvIa3a9 2hfOvp+W/zOGWUuHFVoKS+x926VGzQFdzlsAZJxVNjtztnKpHhtTgVebByOfyyZFxZ l0sqLVxC8ju0RP6VmIid4/cWSaL5K4i+ldldhcgY3P0YcgMt/eKUAsILxXE31EfFLq v8x0GK5kS+fNfviupGRUt3jzVkHoypJIGpKfwM4yd+n+AiouUzt6kLMRfq3pxxxrD8 M8cSIIDeWEz579tPlX6CeXbZxYRXD2zR3EKF50CburMpBDrxWDWutj69gAiEXGsy8k ZGZpnOcM58WVQ== Message-ID: <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> Date: Tue, 22 Jul 2025 09:27:03 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87y0sgpl5n.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-07-22 06:36, Sean Whitton wrote: > tag 79050 + notabug > notfixed 79050 31.1 > thanks > > Hello, > > On Tue 22 Jul 2025 at 09:45am +03, Juri Linkov wrote: > >> Also I remember a minor inconvenience that "--textconv" makes `git diff` >> too slow on encrypted files. Most of the time there is no need >> to see decrypted text in diff output. So I prefered to add "--textconv" >> only occasionally: mostly to verify the encrypted content before committing >> changes, but not when viewing logs with diff. > > Interesting. That's a fair point, but I would argue that the default behavior should favor clarity and discoverability, especially for users who aren't already aware of the interaction between git-crypt and --textconv. While --textconv may introduce some overhead when decrypting large files during git diff, the benefit of getting intelligible output, rather than opaque binary diffs, is significant in most real-world workflows. Users encountering unreadable diffs are unlikely to immediately suspect the absence of --textconv; they're more likely to assume something is broken in Emacs or in a package they are using (e.g., diff-hl). >> Would it be possible to enable this optionally? >> Maybe a simple variable would suffice. This is a much better alternative than simply reverting the change. > Another problem is that you can't commit changes from *vc-diff* buffers > with --textconv, and if you try to do so anyway, it might break things > in your repository, without you realising. Out of curiosity, how can I reproduce the issue that occurs when committing from a vc-diff buffer with --textconv? > Therefore I think that users should have to add this to > vc-git-diff-switches themselves if they want this. I'll revert the > change. If the change is simply reverted, some users may not discover that their issue can be addressed by using the --textconv option. Providing this behavior as an optional, user-configurable variable would make its existence visible through the docstring. This could help reduce confusion and the time users spend investigating why vc-diff appears broken or why tools like diff-hl fail to work correctly in repositories that use git-crypt: https://github.com/dgutov/diff-hl/issues/244#issuecomment-3102297241 -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Jul 2025 19:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: James Cherti Cc: 79050@debbugs.gnu.org, Juri Linkov Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175321305716939 (code B ref 79050); Tue, 22 Jul 2025 19:38:01 +0000 Received: (at 79050) by debbugs.gnu.org; 22 Jul 2025 19:37:37 +0000 Received: from localhost ([127.0.0.1]:39651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueInx-0004P8-1O for submit@debbugs.gnu.org; Tue, 22 Jul 2025 15:37:37 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:45510) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueInu-0004Og-Fp for 79050@debbugs.gnu.org; Tue, 22 Jul 2025 15:37:35 -0400 DKIM-Signature: a=rsa-sha256; b=AO5VijIsAEZBn4mYEmO5rkQ9G/ESsQyktz2uEbkQA35To2sjsxrASsdQCdp59fDaXfqcq8bioUyTcm42HXXuR8cl4KotSH+7vpyBHe5ih/0iHTADpKwW9slIdQgl+fS6OmvimBwpMoCbJcirpjBtl9vcTVRzpNwZ7vmbsfdlVnZB2yK+nneyxUsONJck0PIF6/+4441jaIFyfFZpp33DB30SiU9C8v4f9XP+KCdGvaDWcz5j1/4d5Ff0rHW2U6M6CK5lcSwT2/cfVrbb6qeJxbOViWvXSM1Xo/fhWfRak264KJ7Jt01gWKPhDQYWdAkGiLLXHJZ7jO4DEsBHWVSIzQ==; s=purelymail2; d=spwhitton.name; v=1; bh=cz0JUXnFuCcoTGtTTzc5o3JFNaCTVqNvcdZsfdS2iNA=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=LbgO4O8pHWoWOIBgKZSATL/1/b4z+XI5YPeuZ9SWxLiNRThbf7rr1mT9LbuGpZwZ9f/BSW2IV5QQ31JEAAp0nPyxdkgwYsn85ohue2rLJ1AT1KIWIFB/etIopWW4kJNRpilCpA0XYQlRnlilxw0cRXYPJQIZBIttD3gZgfx4KUvqgUM7FSHbkBFEgGBAdD7WGLgShkNgEGD26we1zJGNpbKj1brvQX2g4W1aQ4aHU54zmSktJDVs4EV87tMUnqfUS62s9JZnZvT0QDv/CI0XVeTTPl2RS4wp4/l1rEUfh6NagspquqiA2k6XMcJf4JwKCvoElXtsl3k+BG4UQkHOGA==; s=purelymail2; d=purelymail.com; v=1; bh=cz0JUXnFuCcoTGtTTzc5o3JFNaCTVqNvcdZsfdS2iNA=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 247498951; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 22 Jul 2025 19:37:27 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id A00F99401CB; Tue, 22 Jul 2025 20:37:25 +0100 (BST) From: Sean Whitton In-Reply-To: <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> Date: Tue, 22 Jul 2025 20:37:25 +0100 Message-ID: <87wm80nhje.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Tue 22 Jul 2025 at 09:27am -04, James Cherti wrote: >> Another problem is that you can't commit changes from *vc-diff* buffers >> with --textconv, and if you try to do so anyway, it might break things >> in your repository, without you realising. > > Out of curiosity, how can I reproduce the issue that occurs > when committing from a vc-diff buffer with --textconv? I believe that if you try to use C-x v v in a diff buffer that's textconv'd, it'll try to apply the plain text diff to the binary file. >> Therefore I think that users should have to add this to >> vc-git-diff-switches themselves if they want this. I'll revert the >> change. > > If the change is simply reverted, some users may not > discover that their issue can be addressed by using the > --textconv option. > > Providing this behavior as an optional, user-configurable > variable would make its existence visible through the > docstring. This could help reduce confusion and the time > users spend investigating why vc-diff appears broken or > why tools like diff-hl fail to work correctly in > repositories that use git-crypt: > https://github.com/dgutov/diff-hl/issues/244#issuecomment-3102297241 The thing is, you could make an argument like this for all the other optional arguments that git-diff{,-index} have. One point of having vc-git-diff-switches is to avoid having a separate Emacs option for each individual optional argument. -- Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 23 Jul 2025 01:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton Cc: 79050@debbugs.gnu.org, Juri Linkov Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175323526916309 (code B ref 79050); Wed, 23 Jul 2025 01:48:02 +0000 Received: (at 79050) by debbugs.gnu.org; 23 Jul 2025 01:47:49 +0000 Received: from localhost ([127.0.0.1]:46693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueOaD-0004Ez-0T for submit@debbugs.gnu.org; Tue, 22 Jul 2025 21:47:49 -0400 Received: from zebra.cherry.relay.mailchannels.net ([23.83.223.195]:37371) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueOa8-0004EZ-Hj for 79050@debbugs.gnu.org; Tue, 22 Jul 2025 21:47:47 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id CF06D4E530F; Wed, 23 Jul 2025 01:47:42 +0000 (UTC) Received: from pdx1-sub0-mail-a201.dreamhost.com (100-120-55-18.trex-nlb.outbound.svc.cluster.local [100.120.55.18]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 782374E3C3A; Wed, 23 Jul 2025 01:47:42 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1753235262; a=rsa-sha256; cv=none; b=66K1tzoAhw96BhSeo+Zs8vCCvPn8gdJiV8gubqGBkxvOZokRfsk+vJMr4FAPAe1EFYL6vt EC27OXDwq/kTCzENxCEB55EzL+6ZlpgrMEqUObNZ+pOneBUgvWpM5y5NeFVGeIPnpdGGmw 7DdvxIH5wFzf3Vyj02DJil9GcvkprLifWoQ7vSLtI8BqhrmJ8Ogo/sFzhv1iTRqEIf5Pdk N/nUS70MVi7pvILmwcIqI2uHai+EikkhB2W1lCEieyyYr62jTMLBOQHCwuJuM/aEcU/ruY 9T6zBmpQSGzYl3+8FKbqhkobbcPTZyCSWhJCe0NjIU4jMC4mI1lhe9qwlR8nIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1753235262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mSVEaExlNeN2FPV+bO2Cfqu/TnIrFZM21vPAMAynS1Q=; b=IngTU9bBB65DMEhBeMDWxP1ZPOJoBdw1K4SLT1lTjkVP2oJLhxWU6Ote2Oy5CtqLitrj2e 7G198pZhFo74pTxiwDIpOrHewjQnW/eNDM/3+uX2mm1c0OzOfO+CuAu0dsgALrxLgRTF1u UJWL6HEWvCdHRlZ8VnYYLidlL/6aladWKGOA5Y419JQRrHUx8kPoEZcm6lDKDraiFk2he1 pGyrlugFmqLy0bPK6fqTZC+D8B0gWcD4XTI4iRnzON/hThwxh8JYjTIE97ytQwB4EfUxWi Vbt2QzxTcEOYz1CveHHl75CE8VTv+Jv+Gymuey94B5HBJm7pS51kYKOF+f3laA== ARC-Authentication-Results: i=1; rspamd-7d4d75f7cc-6ms7d; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Wiry-Chemical: 52b0b7b52c844861_1753235262723_711470138 X-MC-Loop-Signature: 1753235262723:3875452421 X-MC-Ingress-Time: 1753235262723 Received: from pdx1-sub0-mail-a201.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.55.18 (trex/7.1.3); Wed, 23 Jul 2025 01:47:42 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a201.dreamhost.com (Postfix) with ESMTPSA id 4bmxpk0SXKz6n; Tue, 22 Jul 2025 18:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753235262; bh=mSVEaExlNeN2FPV+bO2Cfqu/TnIrFZM21vPAMAynS1Q=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=DzB+RoyenNy8cwzb0/V9VvYHfBwFYovXo6CeR2anyWXH0jBeDsdP8SwW6W4s0zQXR w3iL7QQjABafkwsXj+pFZuSXdeal9M0zjwOxC/GUBUSNVTmi5E4QjbujDAq7zbdtUY Nm0SFdgDoRqSwM44tSUOyZ/PlpTScKMJODPryozTUKtGzBwHP9eMBJWDEjUQkAL7ph MuErdjxBCR0dvgiq2UYjDd+n5PP5D0LRwzCcnhMonLItiTPskTM5I0UNGVk0+ZLRm9 DelJjXnNkEbuztYZyi7xFC2rzGd5sngdxjRmJWOZM8U0EOJ0HdappTWJ5mXRS2N3GL uAV596sCgma3g== Message-ID: Date: Tue, 22 Jul 2025 21:47:41 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> <87wm80nhje.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87wm80nhje.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-07-22 15:37, Sean Whitton wrote: > Hello, > > On Tue 22 Jul 2025 at 09:27am -04, James Cherti wrote: > >>> Another problem is that you can't commit changes from *vc-diff* buffers >>> with --textconv, and if you try to do so anyway, it might break things >>> in your repository, without you realising. >> >> Out of curiosity, how can I reproduce the issue that occurs >> when committing from a vc-diff buffer with --textconv? > > I believe that if you try to use C-x v v in a diff buffer that's > textconv'd, it'll try to apply the plain text diff to the binary file. Thanks for the explanation, Sean. Just a quick note: - with --textconv: I tried committing a git-crypt encrypted file using C-x v v after viewing its diff, and although the operation failed, it didn’t seem to cause any actual harm to the repository (with --textconv activated): vc-do-command: Failed (status 1): git --no-pager apply --cached /tmp/ git-patchncypZR . - Without --textconv, using C-x v v has no effect, it simply displays "No next file" in the minibuffer and does not stage or commit the changes. >>> Therefore I think that users should have to add this to >>> vc-git-diff-switches themselves if they want this. I'll revert the >>> change. >> >> If the change is simply reverted, some users may not >> discover that their issue can be addressed by using the >> --textconv option. >> >> Providing this behavior as an optional, user-configurable >> variable would make its existence visible through the >> docstring. This could help reduce confusion and the time >> users spend investigating why vc-diff appears broken or >> why tools like diff-hl fail to work correctly in >> repositories that use git-crypt: >> https://github.com/dgutov/diff-hl/issues/244#issuecomment-3102297241 > > The thing is, you could make an argument like this for all the other > optional arguments that git-diff{,-index} have. One point of having > vc-git-diff-switches is to avoid having a separate Emacs option for each > individual optional argument. That's a fair point, I agree that duplicating each Git diff option into its own Emacs variable would be defeat the purpose of vc-git-diff-switches. At least this discussion now exists, so users facing similar issues are more likely to come across it when searching for solutions. -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Jul 2025 12:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: James Cherti Cc: 79050@debbugs.gnu.org, Juri Linkov Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175335901617514 (code B ref 79050); Thu, 24 Jul 2025 12:11:01 +0000 Received: (at 79050) by debbugs.gnu.org; 24 Jul 2025 12:10:16 +0000 Received: from localhost ([127.0.0.1]:55399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueum8-0004Xf-0N for submit@debbugs.gnu.org; Thu, 24 Jul 2025 08:10:16 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:37276) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueum5-0004XF-0P for 79050@debbugs.gnu.org; Thu, 24 Jul 2025 08:10:14 -0400 DKIM-Signature: a=rsa-sha256; b=G74E3UcNLFszIj0vHPaMVpsb7+tAfq/7ZzzYo81fSn1O3E9RHdDGwjd+vdt1foUyR8ZpaexXcqfspO94c3u9/Arl8Mov4ZgVG4Hz93SSTLEWlSx3nLjiSmvjq+cG91kWb40f22kCb+5hl9ifrytw7nBoIdoUkZIxZOfYqaOdXeGAbufDb7YbHXcIFKUN5pZWFs3GJg+R2uGDYBATB02Jdnzc64p24hQ3xmN1xRGHwNkbA16qZaszilxCzJOgj9p5l1EszCEpDX7UN56Ql0OnOCPzqTlxYEdH+xno8eYDtDfrV0jOuKxIKOt1rH94ehMEB5810lvdHuKqOza/qdqj/A==; s=purelymail2; d=spwhitton.name; v=1; bh=5IVHZy6o0zh1EFucEHAN1apnOZNtcDIgDIYAJFlILVs=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=ZjaMUfcyZxkVkkPzQ4g9HJtnOdKDjL4kW276hRakLHyrvlu1jp5zXojgA1tVbxs/yKQDGxlJdES/gUaMrg+s+SeLsIjW9cTRTCjFmwsh4bIZAtTim4/GbJElWlbmDJt/fn5fUUFduWN3sO4xWa3wChU5y+oJxmJGIMT/qgjzWCP6SZxdYpN8H2BoXyzSVfnBNW+nSe4gc6sPhDMxucxrW/aUXaKUdkwwXz09u4b56PAJRayYuQE/anoXtsvXx7O0TtCS+O7J/Z8Oze0Si6IuUxjwGIsHqeejzEaVyc/0iwryGMj6fz1FTUL02U57O0rq/gyWzf0ieD4EPN3Ah//Cnw==; s=purelymail2; d=purelymail.com; v=1; bh=5IVHZy6o0zh1EFucEHAN1apnOZNtcDIgDIYAJFlILVs=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 459869654; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 24 Jul 2025 12:10:06 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 932779401B5; Thu, 24 Jul 2025 13:10:05 +0100 (BST) From: Sean Whitton In-Reply-To: References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> <87wm80nhje.fsf@zephyr.silentflame.com> Date: Thu, 24 Jul 2025 13:10:05 +0100 Message-ID: <87frelu6w2.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Tue 22 Jul 2025 at 09:47pm -04, James Cherti wrote: > Just a quick note: > - with --textconv: I tried committing a git-crypt > encrypted file using C-x v v after viewing its diff, and > although the operation failed, it didn=E2=80=99t seem to cause any > actual harm to the repository (with --textconv activated): > vc-do-command: Failed (status 1): git --no-pager apply > --cached /tmp/ git-patchncypZR . > > - Without --textconv, using C-x v v has no effect, it simply > displays "No next file" in the minibuffer and does not stage > or commit the changes. I'm being cautious about this because I don't know the full range of uses for textconv filters, and because after reading the manpages regarding --textconv it does make it sound like there are textconv filters where with --no-textconv you'd get a diff that could be applied to files even if it is less human-readable. That might not be true for git-crypt(1), but that's just one case. Would you happen to know about any other uses for textconv filters besides git-crypt(1)? --=20 Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Jul 2025 14:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton Cc: 79050@debbugs.gnu.org, Juri Linkov Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175336756624417 (code B ref 79050); Thu, 24 Jul 2025 14:33:02 +0000 Received: (at 79050) by debbugs.gnu.org; 24 Jul 2025 14:32:46 +0000 Received: from localhost ([127.0.0.1]:57329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uex01-0006Li-PU for submit@debbugs.gnu.org; Thu, 24 Jul 2025 10:32:46 -0400 Received: from quail.birch.relay.mailchannels.net ([23.83.209.151]:51129) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uewzz-0006LA-6o for 79050@debbugs.gnu.org; Thu, 24 Jul 2025 10:32:44 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 41583465EB; Thu, 24 Jul 2025 14:32:41 +0000 (UTC) Received: from pdx1-sub0-mail-a308.dreamhost.com (trex-blue-0.trex.outbound.svc.cluster.local [100.120.166.193]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 14BB84519A; Thu, 24 Jul 2025 14:32:21 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Wide-Eyed-Wide-Eyed: 07946bb463b81147_1753367561143_991095636 X-MC-Loop-Signature: 1753367561143:4226459371 X-MC-Ingress-Time: 1753367561143 Received: from pdx1-sub0-mail-a308.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.166.193 (trex/7.1.3); Thu, 24 Jul 2025 14:32:41 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a308.dreamhost.com (Postfix) with ESMTPSA id 4bntkX3vLkzWZ; Thu, 24 Jul 2025 07:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753367540; bh=d6U/7QtWXLOPrTMI7XhrSPn9/IDoGRoZHtBDlxbFy7Y=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=PGSFL3K4S8pQ85yIN9maQU8VeCNi3JVcZcbzHqcQJPJLa5U1M9Ycx9GDjm+Y+G6tw SE9l17872OpaK3mEIfsnfXKEmnSP4wYFKZTvcefK4V6fB9K+s+di0w/kZ9ScoeXotU 4EUTvxqhAu8ymYnVbrufZClbFBbG2BZcgkBTmTNkMohAB4VAK9IoynfQGT6L8Bz/PC ya1Ckw1Gjl4oSA531I6wjRyIPDXqJsELRVYfKDrLUym0k58Sxzzf4mn2rAcT47dVL7 8F/tsAybIosfrg4ihdm6TnH++9LJ73Z3ur90aJiAZBhvDxyac6iuyhK3zLpqeVmcV8 XbJjo3b1JrjIw== Message-ID: <4e49b8b1-8d13-4f59-8350-b610ad933b3b@jamescherti.com> Date: Thu, 24 Jul 2025 10:32:19 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> <87wm80nhje.fsf@zephyr.silentflame.com> <87frelu6w2.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87frelu6w2.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-07-24 08:10, Sean Whitton wrote: > Hello, > > On Tue 22 Jul 2025 at 09:47pm -04, James Cherti wrote: > >> Just a quick note: >> - with --textconv: I tried committing a git-crypt >> encrypted file using C-x v v after viewing its diff, and >> although the operation failed, it didn’t seem to cause any >> actual harm to the repository (with --textconv activated): >> vc-do-command: Failed (status 1): git --no-pager apply >> --cached /tmp/ git-patchncypZR . >> >> - Without --textconv, using C-x v v has no effect, it simply >> displays "No next file" in the minibuffer and does not stage >> or commit the changes. > > I'm being cautious about this because I don't know the full range of > uses for textconv filters, and because after reading the manpages > regarding --textconv it does make it sound like there are textconv > filters where with --no-textconv you'd get a diff that could be applied > to files even if it is less human-readable. That might not be true for > git-crypt(1), but that's just one case. > > Would you happen to know about any other uses for textconv filters > besides git-crypt(1)? I agree, Sean, it's reasonable to be cautious here and let the user choose if they want to add --textconv to their configuration. -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Jul 2025 16:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton Cc: 79050@debbugs.gnu.org, James Cherti Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17533746014296 (code B ref 79050); Thu, 24 Jul 2025 16:30:02 +0000 Received: (at 79050) by debbugs.gnu.org; 24 Jul 2025 16:30:01 +0000 Received: from localhost ([127.0.0.1]:57919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ueypU-00017D-H1 for submit@debbugs.gnu.org; Thu, 24 Jul 2025 12:30:00 -0400 Received: from mout-y-111.mailbox.org ([91.198.250.236]:40656) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ueypQ-00016P-Gw for 79050@debbugs.gnu.org; Thu, 24 Jul 2025 12:29:58 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-y-111.mailbox.org (Postfix) with ESMTPS id 4bnxL20pM9z9xw6; Thu, 24 Jul 2025 18:29:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linkov.net; s=MBO0001; t=1753374586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tlxvbUcbYUOdyaCZ/O6RUSD9xc/YlzYftpRkNnXY2So=; b=arC6iXIF2nUURjf5uU1KVrazjhA7wdpjSPKd/gEMP/nCaFpwqJ8Jz8xqJ9UIv45yRzTcp8 rObvzpS3UuZjcuOgGu1EQXek7Bq6gO9uR/c8KVHwOE+Z767AK4U0jgaUjKQG/NQnMfT8sB TlxayPdsZOkb9cwosGDyxqD/7wEoQWcKWki2y9r2VtZv0JkpGaO1OCphn+eQIXIVtAMkBL w3TXrENiP+oTz9YJSlUYnf2px8JMW/n0MMJRzvWoLNJZ8vZjKWTX909AcPhRXqNEZLqRCO jbxk/IdnljvA1uJj4Zmsa77DK6mGLjjVPrU8ZRhZaExhY+k3VcX8hc4gsWkgRA== From: Juri Linkov In-Reply-To: <87frelu6w2.fsf@zephyr.silentflame.com> Organization: LINKOV.NET References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> <87wm80nhje.fsf@zephyr.silentflame.com> <87frelu6w2.fsf@zephyr.silentflame.com> Date: Thu, 24 Jul 2025 19:28:54 +0300 Message-ID: <87wm7xv9xt.fsf@mail.linkov.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > Would you happen to know about any other uses for textconv filters > besides git-crypt(1)? I'm using textconv filters for Rails credentials. The command `rails credentials:diff --enroll` adds more lines to these files: .gitattributes: config/credentials/*.yml.enc diff=rails_credentials .git/config: [diff "rails_credentials"] textconv = rails credentials:show The problem is that the textconv filter command `rails credentials:show` is very very slow that makes diff viewing experience too frustrating. So I add the --textconv switch very rarely, only when there is a real need to check the contents of the encrypted files. But I'm not opposed to adding this switch by default, provided there is a way to remove it. From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 24 Jul 2025 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Juri Linkov Cc: 79050@debbugs.gnu.org, James Cherti Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17533888591729 (code B ref 79050); Thu, 24 Jul 2025 20:28:02 +0000 Received: (at 79050) by debbugs.gnu.org; 24 Jul 2025 20:27:39 +0000 Received: from localhost ([127.0.0.1]:58731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uf2XT-0000Rn-75 for submit@debbugs.gnu.org; Thu, 24 Jul 2025 16:27:39 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:38182) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uf2XQ-0000RL-PM for 79050@debbugs.gnu.org; Thu, 24 Jul 2025 16:27:37 -0400 DKIM-Signature: a=rsa-sha256; b=dL7AkSSvu5ofQIZFrBAHF4qspMBqo2s8X/cP3Xv2xEFaifqktbfN+NIwzRhJzkIVRh8fjEwc3zyQazUVyTfM70d0Hxt7mYWlFPUJztES9y84a0ZtWhJ7UqLB+hcq2MPHNY0T0SaHX+Fq9YHjSiY9OwMLVOTN9qsX0oWXrH1sQZM21DqUbTJJdyMR44BNnd41LBkzgBLX2Sq4LlhFm/kKRKW1dsUf0ZZ19CRHCwiTVFUv9MEzzluWzRKeYNWo00MG2Rf+g/iGQsleD+PZksWxp6taWiouRla3guI23Sf4rS9kXkBaG2Rj9NOqr50hJ9ikZqKDr2WAZ7ly5ID/X+7xFg==; s=purelymail2; d=spwhitton.name; v=1; bh=QVi3GG0eqol5ZAzwPBKLDPVi5J/HcWrF8Db8arxF/24=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=ZJEEmnGx1XTUa0rD5zlosnGFLCi1P2z+gS4jpm3aIFKGQwUUeoOn648f524DYKHjiX9pcTMuS/i0/Ju3joJSztaEkRCfcEdBjk/B4FrxyPO47Hc186Ejs982BLPC3tlPQzK8nyJamw43Ump+A6hG0o4UhIvnofobeyC6ZIeg8US+7wthfWs1cEr46HrhSbeoZa7lyajmPuI4wIs/VmPoWKrFix55w6kokvI1pm2HvDz/a5BtaWWHC0zVZ3st1DwJFBamvwBvOay+06/4EV5tqm0+hB7f9uR8gIKOr/5gF/df4XBaFp7UuTQuJFEOLTotnDbu8XoEqF1IHEWvNTsjSw==; s=purelymail2; d=purelymail.com; v=1; bh=QVi3GG0eqol5ZAzwPBKLDPVi5J/HcWrF8Db8arxF/24=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 2141147485; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Thu, 24 Jul 2025 20:27:29 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id 3F72F9401B6; Thu, 24 Jul 2025 21:27:28 +0100 (BST) From: Sean Whitton In-Reply-To: <87wm7xv9xt.fsf@mail.linkov.net> References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87o6tfuomr.fsf@zephyr.silentflame.com> <87tt34bun6.fsf@mail.linkov.net> <87y0sgpl5n.fsf@zephyr.silentflame.com> <5dda7208-299a-43e7-9238-ea86fa28a43d@jamescherti.com> <87wm80nhje.fsf@zephyr.silentflame.com> <87frelu6w2.fsf@zephyr.silentflame.com> <87wm7xv9xt.fsf@mail.linkov.net> Date: Thu, 24 Jul 2025 21:27:28 +0100 Message-ID: <87qzy5s5an.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Thu 24 Jul 2025 at 07:28pm +03, Juri Linkov wrote: >> Would you happen to know about any other uses for textconv filters >> besides git-crypt(1)? > > I'm using textconv filters for Rails credentials. The command > `rails credentials:diff --enroll` adds more lines to these files: > > .gitattributes: > config/credentials/*.yml.enc diff=rails_credentials > > .git/config: > [diff "rails_credentials"] > textconv = rails credentials:show > > The problem is that the textconv filter command > `rails credentials:show` is very very slow > that makes diff viewing experience too frustrating. > > So I add the --textconv switch very rarely, > only when there is a real need to check the contents > of the encrypted files. > > But I'm not opposed to adding this switch by default, > provided there is a way to remove it. Thanks. One option, btw, is to add it to the default value for vc-git-diff-switches. But for now I think we should probably leave it out. -- Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Richard Stallman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Jul 2025 02:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: James Cherti Cc: 79050@debbugs.gnu.org Reply-To: rms@gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17537558632315 (code B ref 79050); Tue, 29 Jul 2025 02:25:02 +0000 Received: (at 79050) by debbugs.gnu.org; 29 Jul 2025 02:24:23 +0000 Received: from localhost ([127.0.0.1]:58912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uga0s-0000bH-St for submit@debbugs.gnu.org; Mon, 28 Jul 2025 22:24:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56022) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uga0q-0000al-JK for 79050@debbugs.gnu.org; Mon, 28 Jul 2025 22:24:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uga0k-00075z-HP; Mon, 28 Jul 2025 22:24:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=Av7Dr7UVzET6snkQGUWRtTsK3XqUW222UhBnmvgJ8tE=; b=mZ7pTgtKUMax lY+Mifql97PmewMGjSHh5BZpsecZ0giVnJCJSzrKEWBqDr5hqS3lmW9eBoDiYNSAxz81ndANnzLbN JpEkKNWIrFOx2NmuiG+IhtIgRU6kdFMSvp31S0uY8STCnNjaAhT9nfSNKejQArlz9ewZ6n5hFzeVd 8HKr9AIT+YG6K6oVjm/1kNKOkG8rYdQX/dfSjfBzeJ+jo1NzegfkjP70XADL7JacVZB6mc8uH481S 3mg1uC9EUL1y320Q1eNaQhn6Rr4johpiFdypazWFouZe9RlhU3JMBlZrjDOIDQRpS52Cul6tjhenR DPuJF0D57JsznmwBgobQfw==; Received: from rms by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1uga0h-0005Jb-NG; Mon, 28 Jul 2025 22:24:11 -0400 Content-Type: text/plain; charset=Utf-8 From: Richard Stallman In-Reply-To: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> (message from James Cherti on Sat, 19 Jul 2025 13:59:40 -0400) References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> Message-Id: Date: Mon, 28 Jul 2025 22:24:11 -0400 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > When using vc-diff in a Git repository where all files are > encrypted with git-crypt https://github.com/AGWA/git-crypt > the output does not reflect actual changes. What is the use case of git-crypt? Why put code in a public repo and make it impossible for the public to see? -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org) From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Jul 2025 08:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Richard Stallman Cc: 79050@debbugs.gnu.org, James Cherti Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17537769056413 (code B ref 79050); Tue, 29 Jul 2025 08:16:02 +0000 Received: (at 79050) by debbugs.gnu.org; 29 Jul 2025 08:15:05 +0000 Received: from localhost ([127.0.0.1]:60125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugfUG-0001fN-SH for submit@debbugs.gnu.org; Tue, 29 Jul 2025 04:15:05 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:59780) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugfUD-0001eR-W2 for 79050@debbugs.gnu.org; Tue, 29 Jul 2025 04:15:03 -0400 DKIM-Signature: a=rsa-sha256; b=cbudPrrKSGCBWO4fgUH3e5uv7WmJ/M4Kl/TdnfvfH7ih14KkIMlaAdU1Cv9P9tJeN+eYUvKhDUSZyd6Ysbgk+8ZC3O0L+4GbEYvnkEL2Oxb+hFVulXZsB2LydkLv95aUo+EIVsWQRvZJ39v7OJxLkeXk85Jrk9ui6Fkt427H30fafnXRwIPXyXFzFLJtVBgfjgU8+uCVci2ia90pTF/njeQHFhhueEX/zZJD4wcVOC3eno/LHSyGZM7b34ai7CMOrGAUbVyL3uiXFxTcqOJqqWup4Z0ELEXr6C96PTF2w4CoyWfmwYnaD2kbm/RQ9uKDrZWHcY/TC9OeezT74zTylA==; s=purelymail2; d=spwhitton.name; v=1; bh=j/ArKHoH+HkiIh5ivlswgL3dFqe7WsgC5ga+qGaGvOk=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=h7iYZY5/lLNJMXOvuue/TVlUWaFBrHyfbbAXgoY+GQAaj5fJ/qOR/FnLqk1WQW9ZQDWkr3mGtnbcfhUqox5x1d8KpQ4UgDo/88hw+HfEv0CLFzfLo6XX4cqYCgvKwIR/zqz8s84ghiEP+pYfnEAmLsmNVs46TE3/ps9hY4gC+hNCYnFdulhvT9wknobBXFzMTwG9MrrnTDNP83ijqrvja7C+sev7qjBuyIxocfvqLZXZ1GKVkAOU7vGuJKjgiEr9OYgaKwroCRX+KM5wsBpWUpKtljURGfYRMDCi4zKwZ/sQMw1V88PuSztarv/LbyaqDRYtHPOq+OzGhUiwDrPSlQ==; s=purelymail2; d=purelymail.com; v=1; bh=j/ArKHoH+HkiIh5ivlswgL3dFqe7WsgC5ga+qGaGvOk=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 160416349; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 29 Jul 2025 08:14:54 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id CD0E39402EE; Tue, 29 Jul 2025 09:14:51 +0100 (BST) From: Sean Whitton In-Reply-To: References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> Date: Tue, 29 Jul 2025 09:14:51 +0100 Message-ID: <87qzxzifb8.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Mon 28 Jul 2025 at 10:24pm -04, Richard Stallman wrote: > [[[ To any NSA and FBI agents reading my email: please consider ]]] > [[[ whether defending the US Constitution against all enemies, ]]] > [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > > When using vc-diff in a Git repository where all files are > > encrypted with git-crypt https://github.com/AGWA/git-crypt > > the output does not reflect actual changes. > > What is the use case of git-crypt? Why put code in a public repo > and make it impossible for the public to see? I maintain something similar: git-remote-gcrypt[1] In short, Git repos don't have to be public. I keep everything in Git, in many private repositories. [1] https://spwhitton.name/tech/code/git-remote-gcrypt/ -- Sean Whitton From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: James Cherti Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Jul 2025 15:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton , Richard Stallman Cc: 79050@debbugs.gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17538022431007 (code B ref 79050); Tue, 29 Jul 2025 15:18:02 +0000 Received: (at 79050) by debbugs.gnu.org; 29 Jul 2025 15:17:23 +0000 Received: from localhost ([127.0.0.1]:34929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugm4w-0000GA-CV for submit@debbugs.gnu.org; Tue, 29 Jul 2025 11:17:22 -0400 Received: from zebra.cherry.relay.mailchannels.net ([23.83.223.195]:32649) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugm4o-0000Fb-ER for 79050@debbugs.gnu.org; Tue, 29 Jul 2025 11:17:19 -0400 X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 7D8DD185540; Tue, 29 Jul 2025 15:17:12 +0000 (UTC) Received: from pdx1-sub0-mail-a259.dreamhost.com (trex-blue-2.trex.outbound.svc.cluster.local [100.123.72.252]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id D900C185512; Tue, 29 Jul 2025 15:17:11 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1753802231; a=rsa-sha256; cv=none; b=kPoh2HdMTrFc9qsqLjgEJPGWbdAopJjrzqIIj4MR4NwTSfH/AZzuMvLEOUntmIKymzYoGB Jk/NVhH0Gj0E9XY8wh2uxsX/W7BkPuW6axDngYowzVdtpA2iBEu1mY/EzN2qpv5r+vB8Bc YjDZwo4c3aWkbIsrAqhhED7+CJfanbt0K1KiP94+Tnibzpw1+74HcqXCE+glTaAcsJJLjZ xVkWlhmLKpYVEyApXuqD9LNuvpFOh76v1oiCtxYO/+7Hi1aE2TtWEW1w+UHJnLVfJMTkle cY3Nb3goQhC3Xa0nnIyiwJ4az5Pe4shm2sk1+zgIL6o4PVTy8decqDwlCE8Zlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1753802231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wpVki8kHnmSQ/8sVABcmur+TI6HHwjGiSNOm5Jg4w00=; b=9XBIjLebr+sglB/jREtgQxCUQkrpeqoMqGh/prp0AtELjBM7kcO71PdHW5lPTlS7ik+PJC TrtZ/vku6h9ZETm8Va26bwLAqsvQQSay+9KI44le5jvjhqKacEsl5xzU2E1qNUiEaBflPN BPwtC3HdsuFip80rffSblbaujDiZcZBrhAXBQG0jZtDNCyNx+6YbHILsbyjzQGS64J+yXe QhJ6T9cl+qMCxXn+PBoI/GLnlxDIg16yV0Ie9sY/3vqGtDpm3f3Kh+w0YLizRG0I4DQghL Jy8kaAjuIyFLGdDtuIoFBXYRJ9xiODwKzE13n7A141WpH0G0jC8SFogbFVGtVA== ARC-Authentication-Results: i=1; rspamd-7df5bc8bc6-sxjxw; auth=pass smtp.auth=dreamhost smtp.mailfrom=contact@jamescherti.com X-Sender-Id: dreamhost|x-authsender|contact@jamescherti.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|contact@jamescherti.com X-MailChannels-Auth-Id: dreamhost X-Irritate-Turn: 6913dcba5fbd5ce8_1753802232110_3740875630 X-MC-Loop-Signature: 1753802232110:3972669804 X-MC-Ingress-Time: 1753802232110 Received: from pdx1-sub0-mail-a259.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.123.72.252 (trex/7.1.3); Tue, 29 Jul 2025 15:17:12 +0000 Received: from [192.168.5.23] (24-212-139-93.cable.teksavvy.com [24.212.139.93]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: contact@jamescherti.com) by pdx1-sub0-mail-a259.dreamhost.com (Postfix) with ESMTPSA id 4brzTz3Tqdz83; Tue, 29 Jul 2025 08:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jamescherti.com; s=dreamhost; t=1753802231; bh=wpVki8kHnmSQ/8sVABcmur+TI6HHwjGiSNOm5Jg4w00=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=UxVilZ7MGAdm0knejQiQdUhUMt+2KwNih4RcnDG2r4pROjzvW+ESd2YCUnFn3gr4j /FKbzAyGLrc9cBBnuOCCn9mIBJYvq7R54CgxVEk0dHm3+KSfud6xanbjUO2lTsDi2e w8oFTXKXhj5P8mcNkRDug3aNqOccJzBNGhnnuAySnXl029fno5G1jbz7NyzfPaE/8t 1y8YjuSViQ8w7YvvuQ4lzkMfUGxw39Z2s0EmTIE+5P5dEBo+nX9W3HeaaKK7wN3+C1 boBoc92cOXTB10dww92DT8HaZhsuSdG2ATzkOTqnR0UZgtwcrlpIjAdZBByefqhxaF Znids0DBGAWyA== Message-ID: <908c12d8-b6c8-4af1-bc51-deec16749be2@jamescherti.com> Date: Tue, 29 Jul 2025 11:17:10 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87qzxzifb8.fsf@zephyr.silentflame.com> Content-Language: en-US From: James Cherti In-Reply-To: <87qzxzifb8.fsf@zephyr.silentflame.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2025-07-29 04:14, Sean Whitton wrote: > Hello, > > On Mon 28 Jul 2025 at 10:24pm -04, Richard Stallman wrote: > >> [[[ To any NSA and FBI agents reading my email: please consider ]]] >> [[[ whether defending the US Constitution against all enemies, ]]] >> [[[ foreign or domestic, requires you to follow Snowden's example. ]]] >> >> > When using vc-diff in a Git repository where all files are >> > encrypted with git-crypt https://github.com/AGWA/git-crypt >> > the output does not reflect actual changes. >> >> What is the use case of git-crypt? Why put code in a public repo >> and make it impossible for the public to see? > > I maintain something similar: git-remote-gcrypt[1] > > In short, Git repos don't have to be public. > I keep everything in Git, in many private repositories. > > [1] https://spwhitton.name/tech/code/git-remote-gcrypt/ Hello Sean and Richard, The git-remote-gcrypt tool sounds interesting. I'll take a closer look at it. Tools such as git-crypt are relevant for: - Infrastructure-as-code repositories containing secrets (e.g., sensitive credentials or API keys in configuration files). - Personal knowledge bases, journals, internal research, etc. - Prototypes not intended for public distribution. - And many other similar scenarios. In such contexts, placing code or data in an internal or a semi-public Git repository (e.g., hosted on a private GitLab/GitHub instance, corporate Git server, or a self-hosted server) does not imply that its contents should be readable by everyone. The goal is availability, traceability, and collaboration, not necessarily universal readability. From a security standpoint, this is not merely about privacy but about reducing risk. Repositories, even private ones, may be exposed through misconfigurations, insider threats, or breaches. If data is encrypted using tools like git-crypt, then even if an unauthorized party gains access to the repository, the sensitive content remains protected. It is important to note that git-crypt only encrypts file contents, it does not encrypt file names or commit metadata. -- James Cherti GitHub: https://github.com/jamescherti Website: https://www.jamescherti.com/ From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Richard Stallman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Aug 2025 02:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Sean Whitton Cc: 79050@debbugs.gnu.org, contact@jamescherti.com Reply-To: rms@gnu.org Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.175410281117083 (code B ref 79050); Sat, 02 Aug 2025 02:47:01 +0000 Received: (at 79050) by debbugs.gnu.org; 2 Aug 2025 02:46:51 +0000 Received: from localhost ([127.0.0.1]:60233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ui2Go-0004RS-W2 for submit@debbugs.gnu.org; Fri, 01 Aug 2025 22:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50742) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ui2Gi-0004R1-Fk for 79050@debbugs.gnu.org; Fri, 01 Aug 2025 22:46:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ui2Gc-0005wg-C9; Fri, 01 Aug 2025 22:46:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=4YE4FS6o7GKOIFa/GmIWf5AwCddO1lSc9gDqQhlQflI=; b=o7NCH8QVyGSs aNBzSNEGfwn++skwgQL0kdmZsngfVlzGszscaAAL+OWqUfEi2xkfyuzO/bidgt/647mmk4RYs/Ejg 8XySCGPDQxro0ndtQBfZ02sGhzIkiqKmiLniqwQ4PQMcMAOa47/KXGqfo3uh109WhmSR16keiNwGL ui1Ndbpi93aGDbWewGLIKUMBBn1ofEWBRUtinuPosef7hrX0DHfhfxno16+uBl/VRyTl9QhApJY6N Po0B6fAj0AVwTiJVH086v5wveP04do00H+dRaced/YSl+eVmrifN+arYITPutU36TcoU5kWs5gh9a mZWm4n2CmOE3dPmEy3vesQ==; Received: from rms by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1ui2Gb-0005Co-Qc; Fri, 01 Aug 2025 22:46:37 -0400 Content-Type: text/plain; charset=Utf-8 From: Richard Stallman In-Reply-To: <87qzxzifb8.fsf@zephyr.silentflame.com> (message from Sean Whitton on Tue, 29 Jul 2025 09:14:51 +0100) References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87qzxzifb8.fsf@zephyr.silentflame.com> Message-Id: Date: Fri, 01 Aug 2025 22:46:37 -0400 X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > What is the use case of git-crypt? Why put code in a public repo > > and make it impossible for the public to see? > I maintain something similar: git-remote-gcrypt[1] > In short, Git repos don't have to be public. > I keep everything in Git, in many private repositories. I don't follow the reasoning of this. If a repo is private, why encrupt its contents? Some files on my disk are private too, but I mostly don't encrypt them. Is there a point that isn't clear to me? -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org) From unknown Thu Aug 14 22:25:02 2025 X-Loop: help-debbugs@gnu.org Subject: bug#79050: vc-git incorrectly treats git-crypt encrypted files as binary, even when unlocked Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Aug 2025 12:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79050 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: notabug To: Richard Stallman Cc: 79050@debbugs.gnu.org, contact@jamescherti.com Received: via spool by 79050-submit@debbugs.gnu.org id=B79050.17542256129699 (code B ref 79050); Sun, 03 Aug 2025 12:54:01 +0000 Received: (at 79050) by debbugs.gnu.org; 3 Aug 2025 12:53:32 +0000 Received: from localhost ([127.0.0.1]:43127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uiYDU-0002WM-3O for submit@debbugs.gnu.org; Sun, 03 Aug 2025 08:53:32 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:41428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uiYDR-0002W2-FK for 79050@debbugs.gnu.org; Sun, 03 Aug 2025 08:53:30 -0400 DKIM-Signature: a=rsa-sha256; b=AqTFD8DyUbxJbUOtSxm9UFJGhPxbOnZKvP/l7aAo0Gjgklns2IHpusx3gDUoD/PLqG5HRJNYoMOQ2zZFTHuJlZzP3iP5kK+7daDpY2kTLFcIU27zFYhuYvTy9P5XeBEpxVNnifBgyoaQ5epD/++YpCN1Qf8hVGrJ3SGAPMW99fqnosSEt989WRZpcBTs6Xgc8Op0/loXtzkMrP0exwmVlpmcQj44IMLjYyeieY9Xh6MwDhNgSb42E+a3YKwaB8TIu9C0ZOTAcNbSMxD3x0/df4mbSW5CNsGTJN0lg2J8uTK6cdtHc3aGAPdYsANH4INhySDqaV4BELzk8p/QCj8zTw==; s=purelymail3; d=spwhitton.name; v=1; bh=jMz6kG9KKIA8B506wOORXuiTv9uiWM/xlWuo/Alze0A=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=fae0fchST1aGh2nfJ2kGcYPoe3jXnVdHtS/UbkkQnDnWsjeve0KE7B+bhnpPsKM9Kt6cvoJ6xhz6y+swfhIedhZMX2OQAXE7qf+F08DZhkRn42iy9YnlA+FxaNiYklBCV9HECMb9TLpHId6HE5XN8M6MDcU+pzFuHid5ltd94ALs3+AMjEuynPhYfBB32Q/dnRTjOqef9w05Syl1uF8ye2GBrQyZ1rCNNZlAfHJQj9KjIqfK6rNqHzXkeayeU/BVUELPpgzQaWRrXSEwVm8AqCnvqOVQiMazylXx0RzcaA1T+Mo1u4C0NAB/kYbtsFzPu6+94a2b6wQIwuOwzo1RYw==; s=purelymail3; d=purelymail.com; v=1; bh=jMz6kG9KKIA8B506wOORXuiTv9uiWM/xlWuo/Alze0A=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 79050@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1177013145; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 03 Aug 2025 12:53:20 +0000 (UTC) Received: by zephyr.silentflame.com (Postfix, from userid 1000) id D858894049E; Sun, 03 Aug 2025 13:53:19 +0100 (BST) From: Sean Whitton In-Reply-To: References: <92be1399-fdf2-4dc6-af1a-a51491d1a95a@jamescherti.com> <87qzxzifb8.fsf@zephyr.silentflame.com> Date: Sun, 03 Aug 2025 13:53:19 +0100 Message-ID: <87ldo0r2gw.fsf@zephyr.silentflame.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, On Fri 01 Aug 2025 at 10:46pm -04, Richard Stallman wrote: > [[[ To any NSA and FBI agents reading my email: please consider ]]] > [[[ whether defending the US Constitution against all enemies, ]]] > [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > > > What is the use case of git-crypt? Why put code in a public repo > > > and make it impossible for the public to see? > > > I maintain something similar: git-remote-gcrypt[1] > > > In short, Git repos don't have to be public. > > I keep everything in Git, in many private repositories. > > I don't follow the reasoning of this. If a repo is private, > why encrupt its contents? Some files on my disk are private too, > but I mostly don't encrypt them. > > Is there a point that isn't clear to me? So you can push to a remote server you don't fully control. -- Sean Whitton