From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Morgan Smith Newsgroups: gmane.emacs.bugs Subject: bug#59158: [PATCH] vc-git: Ensure git doesn't try to colorize stashes Date: Wed, 09 Nov 2022 16:22:06 -0500 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22566"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 59158@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Nov 09 22:23:36 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ossXn-0005eE-Bc for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Nov 2022 22:23:35 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ossXL-0005S0-Cm; Wed, 09 Nov 2022 16:23:07 -0500 Original-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 1ossXJ-0005RX-EM for bug-gnu-emacs@gnu.org; Wed, 09 Nov 2022 16:23:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ossXG-0007io-WF for bug-gnu-emacs@gnu.org; Wed, 09 Nov 2022 16:23:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ossXG-0002n2-E9 for bug-gnu-emacs@gnu.org; Wed, 09 Nov 2022 16:23:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Nov 2022 21:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59158 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166802894010673 (code B ref -1); Wed, 09 Nov 2022 21:23:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Nov 2022 21:22:20 +0000 Original-Received: from localhost ([127.0.0.1]:41074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ossWa-0002m5-7t for submit@debbugs.gnu.org; Wed, 09 Nov 2022 16:22:20 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:36934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ossWU-0002lv-W3 for submit@debbugs.gnu.org; Wed, 09 Nov 2022 16:22:19 -0500 Original-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 1ossWU-0005Gg-M5 for bug-gnu-emacs@gnu.org; Wed, 09 Nov 2022 16:22:14 -0500 Original-Received: from mail-bn8nam04olkn2107.outbound.protection.outlook.com ([40.92.47.107] helo=NAM04-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ossWS-0007d8-P1 for bug-gnu-emacs@gnu.org; Wed, 09 Nov 2022 16:22:14 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C2axrnyqB81x6tIoX1Y3AZzk9YdNUbGCbPUq47rscPNoYOemb5sx03Syzr2PRszApTMbLRD+y5YBZIJHwqK/uU4e5TadxbS5Wsx5xS/Z7aCuGER8dlXu5xZYYTWdjzvlSQp44ZXbSA4lBJUqdfTUkTuLX1O4G9nGPUHwJQkJ+UEwhoYyu8RZFjeWk2jA2HOULCIoKKloSIYHfvTa7JyH2gCspl3zutAhxZeamgMJS2edidEbRV8J49/d4DusCvTi1/VclYNajPg75hmdDvnCUcWTQ09HJWmEjsHWX6TpX4FlfP4Vu3YXlIPSCCEJlh9fDaZeiDLo7oeGto56GQS0Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RJw6bhDmq1QeH36XzePfJBbPobNu9Y7GVrM+nUyotog=; b=Jb2Z/JIw2CGuDcY15b1BbRip09faAXZpFIsi9bzgGt9kQ8aNKloR/dqVF4E44O8c4i3a4uJ45+lejK0+GITqJ519koWMnKcc0SU7a9BextpbkAaZ78kYcXjOLqq0fRqEl1de4FGDwCgEdqKcsr76surLJaaxXKkCYtfAD7c8vcJ6EwWrMF9MjwI/F9QA7wqG9fa3JNNNisRSRUtCfwOCAS4KyyhWdfXsJS1J1x5IkrTOtWT5b1hH5fihKsqwvB+ZDwwzVLFykm/evoz6QEPE2bVYGoGzXHr5zHZYTLB+XNrVb1Wtp0cbfT8AmCLWy15K7Tne0j5qWbdarLkpzBAoeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RJw6bhDmq1QeH36XzePfJBbPobNu9Y7GVrM+nUyotog=; b=GKk2spBYGYVPIhpJh0bD1+nEoCtTW41A23ASSY4M4tVcLSqSoqyiUYEso7a4LCgbMsIb8FQ0Lif0rbpbeyhUv1ynIIl2MINTZreCsKSygPZ4+er96QP+t1msRhjpl0Q3fO5gfc3At8xPDNorGSG38Aj08PbdpEQsQvUufF0NskLFeUWrJ8nKvc+LkZRA5M0KMFPRiBlc54ggfqF3xk0XR7SuSVIzbmC7DzPjUxxk76COl3qfo2hVapl31ke1Bh/McFFsAtRIhGPMjhtXSMvOgWlBfHs2a/s2sgizPr3vXgjWhAwgL0sYQ81E+46jfcRPbF2iX/LqyUqaCayJhz77mg== Original-Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by BN8PR03MB4977.namprd03.prod.outlook.com (2603:10b6:408:de::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Wed, 9 Nov 2022 21:22:10 +0000 Original-Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::c2b5:f4c2:15bc:359f]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::c2b5:f4c2:15bc:359f%7]) with mapi id 15.20.5791.022; Wed, 9 Nov 2022 21:22:10 +0000 X-TMN: [we0MANMlW5RCjnEFZMY65PCuIMx2/BkZbKnobkDt4c4UIKnqWFnq2w==] X-ClientProxiedBy: YQBPR0101CA0132.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:5::35) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <87v8nnkem9.fsf@outlook.com> X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|BN8PR03MB4977:EE_ X-MS-Office365-Filtering-Correlation-Id: de419619-f690-44d4-d0f4-08dac298765f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gMKsXuUvy3flv6EyzgMb0aBv7tFoDamNKAxGZ/j9+a/SDJtOTj5IVCbtuBvuT9Jbw3Q45F0NAqrcMZMieWha7JFUKaK/FGBWifM2SesYz46FiYE7YnHsxeB2bmrzvZIcMR317/pBSi9wkrFXQokMl6ddgmb+dnwbvvi1Lg35P2GQ++lmVC7RJiMFdixbuIIGh3N6QqIrl2PVwx2YPv0vvHLHjW6V2mWpf+kR+fhVDDWspPVGwoMO5MCM52Lr89MwxB1v4oAnX0/TzCJEfKm4KJcoOmJMXfS95dPz1mlyB4qEGnRcyC+pRRx1yvfZGQ2VKj11DkIvDjiuRR4FWCc7PWdPvC0km6Hk6Nvfq8KVi0r2+SzvPBqrlCEZFHm5WZ+4KKo2PcGIl8vrpuB6R+0KsL3NeXvJlEMr2X7HftZWcFVLRhKkPJNmWNom0nYQy7hPjPjZb/jCXAATVW7EC24u+r4VVf/Ej21GwVUFIK6oHf0c5OBgKHYqPtsdimfScjJpDhyXUen3+HFxxecl8R71w+JMUTiz8u2P3o9khQqGWE1HwkkBlf7j5C1BILdSKYjjRSm89Zw1v2Sp0+JviKPablwbNuigQldJHLL2AqFJmHsCKubZh0soORjBWerJsJRr84dH2Q+aXPDZHAn7QzhkYA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Dj3kkCLLNPY8Vl83UH1oeIITpFvsD0aIZKKDTr81N+KHJKqIDKHVo6aWh+3rfXLCLxS/n5q4Ic7Kc9uTsjZd9n+LjmUfByb81DPtliTWH3AiC937e6U9aZobQ0vvGA92wTqVJDZlJOnT2xiVoK/9eRl2Ki0qwYW2FDpzTaDCnmOJ6Iemq1Ddm199Ak2kcWsfAl7bnADfGZNjHp0ucpzn+OvNpDSCO5vtDr5Nii9pPn9Vl8rv8PyroOm1SrjmHt0IpH+golnKOQW6i9enC+Kz+5eLGp3kSwjyNqwQLrSsGEjh/NldWqU4NvbXUm1BsFSh/GBT2cVqzv/rTvOLJybtDaBiBgpw9VMcB1XygoT0eVX81YZ53yveHqXDjFu+LKvjZvABtpxjD66lx85VrYCOJbYuVCmOnjIQzhN9edB0RAZo7io6zepkYQWIOIEsVKquderQO9znV/ycrFlMZ3gmfHL/LkQ8pjJaP2a+8JERS/g6sKDT86Z4RYr3ji3TqcpkzspQofOk3oJ3jmdw01VUR6MzWabPHo6R2saXAXx5e8F+HVerKTUMUPoOfQG4+PqJFhQCsptxQsaojMJIV5W9AwTBiTGe1JmiUcciwNRS9bHc4GqP6k2U4FICvirpaTYAiQCCGd1QhPd5QHfBRgj5ga15tsYGEsAszqDxrZRUsHo/ON+wyKRbcr53Cuk7/JpEuEViDMpvlwRogIsQIRuR0d6i/Dsl5nLe6FRJyEZDKtnS1efNTW3hCKr4UP NJdPvPfFyGc1ViN4xk4Scc1WjJMiLwaGlTQSH4glq/6oRudc2PbuvSPuACFI1Xr0cqXdeJ+10YDxaaXRZibg8RlEReK5yWqSrR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de419619-f690-44d4-d0f4-08dac298765f X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 21:22:10.6279 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR03MB4977 Received-SPF: pass client-ip=40.92.47.107; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM04-BN8-obe.outbound.protection.outlook.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:247467 Archived-At: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-vc-git-Ensure-git-doesn-t-try-to-colorize-stashes.patch >From 3a5b77c93742ea0ad5ad89d8af3531f18411b88a Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 9 Nov 2022 16:16:55 -0500 Subject: [PATCH] vc-git: Ensure git doesn't try to colorize stashes * lisp/vc/vc-git.el (vc-git-stash-show): Add --color=never to git flags --- lisp/vc/vc-git.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 74536309e2..a1ff03144b 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1883,7 +1883,8 @@ This command shares argument histories with \\[rgrep] and \\[grep]." "Show the contents of stash NAME." (interactive (list (vc-git-stash-read "Show stash: "))) (vc-setup-buffer "*vc-git-stash*") - (vc-git-command "*vc-git-stash*" 'async nil "stash" "show" "-p" name) + (vc-git-command "*vc-git-stash*" 'async nil + "stash" "show" "--color=never" "-p" name) (set-buffer "*vc-git-stash*") (setq buffer-read-only t) (diff-mode) -- 2.38.0 --=-=-= Content-Type: text/plain Hello, So if you've configured git with "git config --global color.ui always" then "git stash show" will create lots of spurious color escape characters that our stash viewer code cannot deal with. This patch makes sure that doesn't happen Thanks, Morgan --=-=-=--