From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 09 16:22:20 2022 Received: (at submit) by debbugs.gnu.org; 9 Nov 2022 21:22:20 +0000 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 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 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 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== 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 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 From: Morgan Smith To: bug-gnu-emacs@gnu.org Subject: [PATCH] vc-git: Ensure git doesn't try to colorize stashes Date: Wed, 09 Nov 2022 16:22:06 -0500 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: multipart/mixed; boundary="=-=-=" 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> MIME-Version: 1.0 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: =?us-ascii?Q?Dj3kkCLLNPY8Vl83UH1oeIITpFvsD0aIZKKDTr81N+KHJKqIDKHVo6aWh+3r?= =?us-ascii?Q?fXLCLxS/n5q4Ic7Kc9uTsjZd9n+LjmUfByb81DPtliTWH3AiC937e6U9aZob?= =?us-ascii?Q?Q0vvGA92wTqVJDZlJOnT2xiVoK/9eRl2Ki0qwYW2FDpzTaDCnmOJ6Iemq1Dd?= =?us-ascii?Q?m199Ak2kcWsfAl7bnADfGZNjHp0ucpzn+OvNpDSCO5vtDr5Nii9pPn9Vl8rv?= =?us-ascii?Q?8PyroOm1SrjmHt0IpH+golnKOQW6i9enC+Kz+5eLGp3kSwjyNqwQLrSsGEjh?= =?us-ascii?Q?/NldWqU4NvbXUm1BsFSh/GBT2cVqzv/rTvOLJybtDaBiBgpw9VMcB1XygoT0?= =?us-ascii?Q?eVX81YZ53yveHqXDjFu+LKvjZvABtpxjD66lx85VrYCOJbYuVCmOnjIQzhN9?= =?us-ascii?Q?edB0RAZo7io6zepkYQWIOIEsVKquderQO9znV/ycrFlMZ3gmfHL/LkQ8pjJa?= =?us-ascii?Q?P2a+8JERS/g6sKDT86Z4RYr3ji3TqcpkzspQofOk3oJ3jmdw01VUR6MzWabP?= =?us-ascii?Q?Ho6R2saXAXx5e8F+HVerKTUMUPoOfQG4+PqJFhQCsptxQsaojMJIV5W9AwTB?= =?us-ascii?Q?iTGe1JmiUcciwNRS9bHc4GqP6k2U4FICvirpaTYAiQCCGd1QhPd5QHfBRgj5?= =?us-ascii?Q?ga15tsYGEsAszqDxrZRUsHo/ON+wyKRbcr53Cuk7/JpEuEViDMpvlwRogIsQ?= =?us-ascii?Q?IRuR0d6i/Dsl5nLe6FRJyEZDKtnS1efNTW3hCKr4UPNJdPvPfFyGc1ViN4xk?= =?us-ascii?Q?4Scc1WjJMiLwaGlTQSH4glq/6oRudc2PbuvSPuACFI1Xr0cqXdeJ+10YDxaa?= =?us-ascii?Q?XRZibg8RlEReK5yWqSrRRt3oWRtEoMGv2k53wP2xICNpjrpLGoqFIiIrFwPd?= =?us-ascii?Q?ihF+qoawwmBbF0UVKgF24q866PHcDDrOCykgErh0hTOKdIvwOe2Z3djmJ7H+?= =?us-ascii?Q?UW9kHy/J1gHAYLqOUMxeGUK7p77EfchBpOKN8mrPwClFLX7s2nKXIgsORKho?= =?us-ascii?Q?OBJXlyR5N/95D00zxocWZb4KWCwHjJdIqvFiUUf1fZPheXX87JzwOzcucQGn?= =?us-ascii?Q?0Jb2+JpFJmCPhLJPsFQE6qq1J3dmH3oVZNrIL7Wz0rSordgM+kys+freUSJi?= =?us-ascii?Q?A235H2WeMNDufFOP8oHKs1jWPkYHaU3y5uIVA9fC59zwwg4995io0+rsZOlp?= =?us-ascii?Q?jYFLZI/0wwZ4kzEoWuHk5BkQoOYxOLayMG2/GiRczmmJnA/Hbq0s4QP/fPW4?= =?us-ascii?Q?iln9V/JuBwvH6NcoyYLqFfSxxL91WBWrrRtu+TMMoHDjrns9bngVfxmHWsF7?= =?us-ascii?Q?QPd/QFxnBirHl/KRKjRdEna1?= 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-Spam-Score: -1.6 (-) 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: -2.3 (--) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 11 07:44:36 2022 Received: (at 59158) by debbugs.gnu.org; 11 Nov 2022 12:44:36 +0000 Received: from localhost ([127.0.0.1]:45247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otTOe-0005g5-9s for submit@debbugs.gnu.org; Fri, 11 Nov 2022 07:44:36 -0500 Received: from mail-oi1-f181.google.com ([209.85.167.181]:41637) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otTOc-0005fp-PZ for 59158@debbugs.gnu.org; Fri, 11 Nov 2022 07:44:35 -0500 Received: by mail-oi1-f181.google.com with SMTP id l127so4795488oia.8 for <59158@debbugs.gnu.org>; Fri, 11 Nov 2022 04:44:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=vRvxvYzNQn1gUEooKNBZGeY97kJt/DpFvws+gTRILxs=; b=jRmu6K6UggSxQeoV8mDkkZrkLFl2w9Eu1jewHfGc2ycnxjJpyT7S4hGKiOVDfiOHyb zIppNTs+S8CIdBuQLmG7J9XDO5R6xxET9lxAQz8kakfypL8dbkmusUAqOP2QuXUcRbV4 9zGsm0rW8AxRo4BiypBacQkgqOds9eE+FmWFeYWEHSXqYzcfVAqjaZPcUrevz0Gg/yh0 DQ7hxNx/d/9biKsPo0oAIWOStTi7bydoqwapTI8MmZCnoSbwK06jxA7Yo3ov3BwdrjwK cjOAb10BGOSv6U9WA/Bu4vH525QJgllrssxEE7Hz4fWvx6G6DXuwk+SW1Zg4eLZd9hSo pkkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vRvxvYzNQn1gUEooKNBZGeY97kJt/DpFvws+gTRILxs=; b=lDU7GWIrejEp4d5vMkz2eywbLbTU3AhKOJGqjS8nFGz63n+74/VAeeRwUYPb6Rp576 jXX7mhl46qEUD3janq8IzZEuk6H7Kb5LUGTAJpnpRT7UNaSLV8d1NMcC0owFZ3vxQFNW LPioi/BLBtU0cj0JaMqoFOabUC/BdgLEClTI8+yn7Y07poaZ+/0Sn9VeOP+Hx+ZRlVcS JqVYjIWXPpb4w1w07ygLhKrJzhjknDSE3hQnsq/miTYntIN/qFjorDPf8BCJQgMkdDcW blVHcghcIsGcHsBpVgmNFk8T3wPsrrg8Hft+v8aP/v5dMmcS0JTA8gxS5V2YQYe0WW8R 8v7Q== X-Gm-Message-State: ANoB5pk0oeJnOM/UgyjZQe5Lyr9DuntbPpfszMyLwQh1SQY3FWT+sZAk 6LwKExm+MWrS7h4HDgAl8C0CmyjgzYONxMHx2SE= X-Google-Smtp-Source: AA0mqf4yurse2LjPcgiHpctm2CPlHsKWk0/Xq4GQobycrMoXyPwEGFtLRuLkddzDDzdjyeO0sgIAloRykYFYDZjm70o= X-Received: by 2002:a54:460b:0:b0:35a:6524:3c1b with SMTP id p11-20020a54460b000000b0035a65243c1bmr644258oip.199.1668170669034; Fri, 11 Nov 2022 04:44:29 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 11 Nov 2022 04:44:28 -0800 From: Stefan Kangas In-Reply-To: (Morgan Smith's message of "Wed, 09 Nov 2022 16:22:06 -0500") References: X-Hashcash: 1:20:221111:morgan.j.smith@outlook.com::RNlgtGNNvZdUCd5M:0oIu MIME-Version: 1.0 Date: Fri, 11 Nov 2022 04:44:28 -0800 Message-ID: Subject: Re: bug#59158: [PATCH] vc-git: Ensure git doesn't try to colorize stashes To: Morgan Smith Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59158 Cc: 59158@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: -1.0 (-) Morgan Smith writes: > 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 How can I reproduce this issue, starting from emacs -Q? From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 12 00:00:10 2022 Received: (at 59158) by debbugs.gnu.org; 12 Nov 2022 05:00:10 +0000 Received: from localhost ([127.0.0.1]:47146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oticj-0000so-Si for submit@debbugs.gnu.org; Sat, 12 Nov 2022 00:00:10 -0500 Received: from mail-oa1-f43.google.com ([209.85.160.43]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otich-0000rQ-Uc for 59158@debbugs.gnu.org; Sat, 12 Nov 2022 00:00:08 -0500 Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-13bd2aea61bso7495634fac.0 for <59158@debbugs.gnu.org>; Fri, 11 Nov 2022 21:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=a/Z2xePrj//9M6+TJyLftDqM421gZsTxTZRgFSzA1dw=; b=YfGJtPRrQFvXBpFPpI67vQ/bNRTc7alMr0BlzWh5Em6LyupYGaF0LbqEvUSAI/BCfx AYmgd/CSKNRnH9pwNmkS1m1gQs0upVxXLivs2ws2ESfGH0xIA7+L6QQTq+PpJQwNQRmU Gm1Ig/GijSwL8GgYqq60B7XAm6eZbGfHxINdeUdveiyAFYrTXdYO0nsFNjZYUCtqeABB 6tBKQJUU7+iYvC02c8yQXCdjY/Y3ZGkPICdhKd1pwvIkMvJq16F+1ORQChWSyZ+od5Ti yvrSO3hu7rOYWGnO91GzEjQsQFgjw298f1hd+CHYtK3oQS9BX3XinHZ7jiLBNifprYhG jEQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a/Z2xePrj//9M6+TJyLftDqM421gZsTxTZRgFSzA1dw=; b=v9yhYmsjvLxgcIJI62bk9E48zzswnFjHAIdNwE0laHPKkKleceROVoU9x2p2JvA/5z zhbPYPL/pDk1RfRcSYamD6K8KgsB+kE5JoBJDqtaKG5uiqtoR9wJ1PJQT44XYruMXPjA Z4sTjGp2UEOnJbZfHw1F7NLvuARl4OVsCXLUMlY0Pqs62u78URvC54Xxn4GVNZ3XMZm5 SBDqDMofMGx0//AulMxq+QsW1/vOI7vq3Gti6ox/P8yjluhZ+EAyyGRp4uGRotVi9n/0 kvgDSWXTcvcdmWwKJfJ/hTsWAHJ4xNOsczUHBFo2eVN/3UnZFynY4H+P0EIt0YbE771n P/VQ== X-Gm-Message-State: ANoB5pkB9TGj/F474XAlD4YTrpdS8rKGco80C9W+YFxWdxAcYzh03NrL Tf/WTN9rtbFSiUTP4MIxgPMXkBMp0idluwYdJuU= X-Google-Smtp-Source: AA0mqf70pQY2cXDfZnWhVonooYFS8djwgcQommGif+GZf3ngn/fzn1POdXbcb053S91XTIZrYbMXAslhnfTyLiK0aA8= X-Received: by 2002:a05:6871:480a:b0:12b:fbe7:b793 with SMTP id qc10-20020a056871480a00b0012bfbe7b793mr2521669oab.92.1668229202116; Fri, 11 Nov 2022 21:00:02 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 11 Nov 2022 21:00:00 -0800 From: Stefan Kangas In-Reply-To: References: X-Hashcash: 1:20:221112:juri@linkov.net::ShljvIHfhhES/Fu2:7B+f MIME-Version: 1.0 Date: Fri, 11 Nov 2022 21:00:00 -0800 Message-ID: Subject: Re: bug#59158: [PATCH] vc-git: Ensure git doesn't try to colorize stashes To: Morgan Smith Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59158 Cc: 59158@debbugs.gnu.org, Juri Linkov 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 (-) [Please use "Reply to all" so that the discussion is recorded in the bug tracker.] Morgan Smith writes: > Stefan Kangas writes: > >> How can I reproduce this issue, starting from emacs -Q? > > I'm using emacs from commit d04433b962 > > > A little background first: > > So when in Emacs using eshell, git won't give us colored output. In > "emacs -Q" we can navigate using eshell to a git repo and type "git > show HEAD" and we will see no color. This might prompt us to run "git > config --global color.ui always". Now we get all the color with no > issues. > > > The steps: > > Go to a git repo with a stash > > Run "git config --global color.ui always" > > Run M-x vc-dir (C-x C-v d) > > Goto stash and hit RET to open the stash > > There are now spurious color control characters everywhere I still can't reproduce this, using this recipe: 0. emacs -Q 1. C-x d ~/wip/emacs RET 2. C-x C-v d I'm now looking at a buffer *vc-dir* that looks like this: VC backend : Git Working dir: ~/wip/emacs/ Branch : master Remote : skangas@git.sv.gnu.org:/srv/git/emacs.git Stash : Hide all stashes (11) {0}: On master: assign {1}: On feature/tree-sitter: wip {2}: On master: tree-sitter [...snip...] 3. With point on "{0}:", type RET Now I get a buffer *vc-git-stash* which is using diff-mode, but I don't see any spurious control characters. [time passes] Okay, I see it now, but I had to do this too: git config --global color.diff always But I cannot reproduce it if I use this instead: git config --global color.diff auto However, as Emacs can't process those control characters in any case, I think we might as well apply the patch you suggest. This will save users from shooting themselves in the foot. Does anyone see any reason not to? > Thanks, > > Morgan From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 12 13:11:10 2022 Received: (at 59158) by debbugs.gnu.org; 12 Nov 2022 18:11:10 +0000 Received: from localhost ([127.0.0.1]:48978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otuyE-00030f-3x for submit@debbugs.gnu.org; Sat, 12 Nov 2022 13:11:10 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:40573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otuyC-0002zs-8g for 59158@debbugs.gnu.org; Sat, 12 Nov 2022 13:11:08 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 84FD7100005; Sat, 12 Nov 2022 18:11:01 +0000 (UTC) From: Juri Linkov To: Stefan Kangas Subject: Re: bug#59158: [PATCH] vc-git: Ensure git doesn't try to colorize stashes In-Reply-To: (Stefan Kangas's message of "Fri, 11 Nov 2022 21:00:00 -0800") Organization: LINKOV.NET References: Date: Sat, 12 Nov 2022 19:57:16 +0200 Message-ID: <868rkgnjib.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59158 Cc: Morgan Smith , 59158@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: -1.7 (-) > However, as Emacs can't process those control characters in any case, I > think we might as well apply the patch you suggest. This will save > users from shooting themselves in the foot. > > Does anyone see any reason not to? Since --color=never doesn't look like a new option of git diff, it should be pretty safe to apply the patch. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 12 14:42:01 2022 Received: (at 59158) by debbugs.gnu.org; 12 Nov 2022 19:42:01 +0000 Received: from localhost ([127.0.0.1]:49063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otwO9-0007RB-Es for submit@debbugs.gnu.org; Sat, 12 Nov 2022 14:42:01 -0500 Received: from mail-oa1-f51.google.com ([209.85.160.51]:43598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otwO8-0007QU-6A for 59158@debbugs.gnu.org; Sat, 12 Nov 2022 14:42:00 -0500 Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-13c2cfd1126so8700240fac.10 for <59158@debbugs.gnu.org>; Sat, 12 Nov 2022 11:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=0trtZJAtJ2WvALxnDGak/hlJdpD5QF2iWRMA/PdmJMM=; b=Qn2RR7sg30wBcojtb/ZdL57CNkyIJ/ssOebIP7rdHQyjpslYfwf71oMaGFO6iXNmPK M0B4LEzD10qP8z/VVixf/5aSVQKAtkGWLPVx6lSLgMs683N+UfM8riHH/hZk7A32ttKw xDODODf6S3FsHeZgZlpmAzUK5OaBJDXgoOcKmGMdQcLRjLqg6nxd18lUwBxOP4vo9lUQ W8fzyDc448b271S7g+u0My1GXdnleXtNSrsGfzhidjvJ8tmR989EY4KYB4C96IyLv4oo liOXEiOVC+ffxrCiNq1QLue7Kr5QTXEBa9+huREigQKWLhoVV2TjF13RWzP4IgEB0UnO ZXEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0trtZJAtJ2WvALxnDGak/hlJdpD5QF2iWRMA/PdmJMM=; b=EyG3UOrbdvfAHMESb20IwoH+uIkMafK0SFKmH6xKV1kQyVB9wH+we2RulELDqFzTFW zS1Qi2SBjS1O8k2ItOLDSE/eBhOX+m1oKfFXkx4L1P4i0dLaFCNSbY6LnZ2cnGKogtJW 4HGBIHl8rRabodgZeYWGrLw9vcuUlcCBXgbPcVS33wcwY8TyBlsnTc7y5+515zwJEh+p qcEXlwtKUSBaEOm0bcAvbStC8k5KmlVWPyipM3azFOBzjjHEmEnGaJ67PJn7pu1DHSgl Ect7KY5PcAZxiruHahjmUQ15yU3kjTY8ILhinY4IFouTmdiaqAFN+HVmHRphqvWMSLk/ 0n+w== X-Gm-Message-State: ANoB5pndFDW1/92vaw9I4CGt4tpG0wPuELwCgdrJjSRRJxjL/DqkngTX S7Fu0kevWL/6NhTPHDpY0fjerTgo5Cv4x606D6s= X-Google-Smtp-Source: AA0mqf5eTOhbFoWVFXGU7fm2NSwv8YZbeoEoQjJEM8ingUUkmoyume7IKoXXs5YPfMiGsDw9tH3L/UmNdUXyu6WCSJk= X-Received: by 2002:a05:6870:6c15:b0:13b:8a07:2a1f with SMTP id na21-20020a0568706c1500b0013b8a072a1fmr3909249oab.199.1668282114641; Sat, 12 Nov 2022 11:41:54 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 12 Nov 2022 11:41:54 -0800 From: Stefan Kangas In-Reply-To: <868rkgnjib.fsf@mail.linkov.net> References: <868rkgnjib.fsf@mail.linkov.net> X-Hashcash: 1:20:221112:juri@linkov.net::M6TsX5hD7lp8MH4A:4xoe MIME-Version: 1.0 Date: Sat, 12 Nov 2022 11:41:54 -0800 Message-ID: Subject: Re: bug#59158: [PATCH] vc-git: Ensure git doesn't try to colorize stashes To: Juri Linkov Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59158 Cc: Morgan Smith , 59158@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: -1.0 (-) close 59158 29.1 thanks Juri Linkov writes: >> However, as Emacs can't process those control characters in any case, I >> think we might as well apply the patch you suggest. This will save >> users from shooting themselves in the foot. >> >> Does anyone see any reason not to? > > Since --color=never doesn't look like a new option of git diff, > it should be pretty safe to apply the patch. OK, pushed to master (commit 4ccc385ab1). From unknown Mon Aug 18 04:42:53 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 11 Dec 2022 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator