From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Maxim Kim Newsgroups: gmane.emacs.bugs Subject: bug#65049: Minor update to the repro steps Date: Tue, 08 Aug 2023 09:17:40 +1000 Message-ID: References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1101"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 65049@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Aug 08 01:18:49 2023 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 1qT9Uu-00005l-IJ for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 08 Aug 2023 01:18:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qT9Ud-0000cc-Pa; Mon, 07 Aug 2023 19:18:31 -0400 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 1qT9UC-0000aJ-0e for bug-gnu-emacs@gnu.org; Mon, 07 Aug 2023 19:18:04 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qT9UA-0003Wa-KG for bug-gnu-emacs@gnu.org; Mon, 07 Aug 2023 19:18:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qT9UA-0005C1-82 for bug-gnu-emacs@gnu.org; Mon, 07 Aug 2023 19:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Maxim Kim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Aug 2023 23:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65049 X-GNU-PR-Package: emacs Original-Received: via spool by 65049-submit@debbugs.gnu.org id=B65049.169145027419947 (code B ref 65049); Mon, 07 Aug 2023 23:18:02 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 7 Aug 2023 23:17:54 +0000 Original-Received: from localhost ([127.0.0.1]:34530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT9U1-0005Be-IY for submit@debbugs.gnu.org; Mon, 07 Aug 2023 19:17:53 -0400 Original-Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:44463) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qT9Tz-0005BP-3E for 65049@debbugs.gnu.org; Mon, 07 Aug 2023 19:17:52 -0400 Original-Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6877eb31261so3685468b3a.1 for <65049@debbugs.gnu.org>; Mon, 07 Aug 2023 16:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691450265; x=1692055065; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=1GMUaDMyWzIwqT/fgmAYICnNgtMuLYVZ5DFdphUo7D4=; b=f7HnnFqRHo0DG8N4Nm5PrfYkDO3xDUMxlFMzG8TFJh3zjcToRwIHPKg19BJI/17bNA qxZ2/0OYYzOxrbYH5QDVRxwzcgKR8tyPbxHW7n2TZDf3J77WEo29gmdIz0RLzDbiogIy n79pu/HnwUqjfSIcIDvaUNrAoApgsvgQiO0yf/bZfg5Ffvkgiu8l5sk1DhmWraOst3/q whGhQMY6zu9ms2QVm1rr0v/kvgWZ3tIaSX6hnVskWTtsEkUtsfrnLr0t/quhlPL4C4Oe dpkABDnBN3BOezM4T8LbcfPfviuW2vXjdvHCdS8OxNEgbzucKOhoZzXp8zapQuycA12R 7gjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691450265; x=1692055065; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1GMUaDMyWzIwqT/fgmAYICnNgtMuLYVZ5DFdphUo7D4=; b=aZpBHlHo+p7xElChpBpfJ303yd99Rmi6CAm/Ccwrwz6GzWAVhRhg//r27wSDCCNOiQ eNZN5o/V2RiiwEz920/QNGWW1NSUFSFGf+x9JXWztQZ3RzyLctW2l1nB3vO3lpAveqzb 967qyVP2rMgsc5wwHNmRYGoN4humMJg8hTJx7jEamhHvX8+ekp1HPX04SyZyjo9DoXX4 z+I2yjhc+jp+S7V0XvTjipPW4x+KNBjJb1vHbG2EGybDz81YNunC7+DzbMycvMYePGFJ Sp41MXkv50mM7iZPyAc7HLLD2Nihnk4Yy344gX3yBAwQjy57xTx09fPF6JRY67y1cUZh QCbQ== X-Gm-Message-State: AOJu0YyqmX2ofhRs3g6fYeZm0nk4KTP3QagjGkOyR1LhWsbouFFLVPe+ awbt97PvYMRjIHVtcUVc1iS+/f4Onc8= X-Google-Smtp-Source: AGHT+IEQPt4Hyyq46qJFQpjeIEJtelIH/4n0mUnBeMXZx47DxWpL7DQwii01Ph0a4v69+b36f1IRFQ== X-Received: by 2002:a05:6a00:b84:b0:67d:22a6:2f54 with SMTP id g4-20020a056a000b8400b0067d22a62f54mr12712475pfj.31.1691450264954; Mon, 07 Aug 2023 16:17:44 -0700 (PDT) Original-Received: from AUWW00125 ([49.255.38.170]) by smtp.gmail.com with ESMTPSA id e22-20020a63db16000000b005642a68a508sm5456269pgg.35.2023.08.07.16.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 16:17:44 -0700 (PDT) In-Reply-To: <83il9qom6k.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 07 Aug 2023 19:24:19 +0300") 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:266903 Archived-At: Eli Zaretskii writes: > Yes, but where did the file git-patchyYAcN5 come from in the first > place? It's that file that is the problem, not how we apply the > diffs in that file. This file is from the failed attempt of C-x v v > If you invoke "git diff SOME-FILE > diffs", from the shell prompt, > where SOME-FILE is a file that is modified wrt the repository's state, > does the file 'diffs' created by this command have DOS CRLF EOL > format, or does it have Unix Newline-only EOL format? Try this with a > file that has Unix EOLs in the repository. It has: U -- utf-16le-with-signature-dos (alias: utf-16-le-dos) UTF-16 (little endian, with signature (BOM)). Type: utf-16 EOL type: CRLF This coding system encodes the following charsets: unicode > If Git produces DOS CRLF EOLs when it generates diffs, then that is > your problem, and it can only be fixed in Git itself: you need to > configure Git to never perform any EOL conversions: > > $ git config --global core.autocrlf false I have just did it and it didn't change the outcome -- still same error, and I have recreated "git diff SOME-FILE > diffs" and it gives the same output. This is strange that after the issued command and "git config --list" I still can see "core.autocrlf=true" even though in the .gitconfig I have it set to false now (and it was "input" before the change). "git config --list --show-origin" shows 2 places: file:C:/Program Files/Git/etc/gitconfig core.autocrlf=true ... file:C:/Users/maxim.kim/.gitconfig core.autocrlf=false and this is weird git isn't picking up user defined setting (git version 2.41.0.windows.3). > This is the only sane setting for multiplatform Git repositories, > especially if you are using Emacs as your editor, because Emacs always > preserves the EOL format of a file you edit, even if the EOL format is > not the "native" one on the platform where you edit the file. > > (In general, when you install Git on Windows, select the "as-is" > option of EOL conversions, then you will not need to perform the above > "git config" command manually, as this will be set up for you from the > get-go.) Let me try to reinstall git and select "as-is" option of EOL conversion > I'm guessing that I don't see the problem you report because I have > disabled EOL conversion in Git years ago. That is probably the case, thanks for your time and help. Max