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: Mon, 07 Aug 2023 11:09:09 +1000 Message-ID: References: <83y1iruky1.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="5842"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 65049@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 07 03:10:29 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 1qSolR-0001KM-MA for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 07 Aug 2023 03:10:29 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSol3-000186-DW; Sun, 06 Aug 2023 21:10:05 -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 1qSol0-00017b-L0 for bug-gnu-emacs@gnu.org; Sun, 06 Aug 2023 21:10:02 -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 1qSol0-000435-CW for bug-gnu-emacs@gnu.org; Sun, 06 Aug 2023 21:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSokz-0003Cy-To for bug-gnu-emacs@gnu.org; Sun, 06 Aug 2023 21:10:01 -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 01:10:01 +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.169137056312276 (code B ref 65049); Mon, 07 Aug 2023 01:10:01 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 7 Aug 2023 01:09:23 +0000 Original-Received: from localhost ([127.0.0.1]:60206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSokM-0003Bu-LF for submit@debbugs.gnu.org; Sun, 06 Aug 2023 21:09:23 -0400 Original-Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:42041) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSokH-0003Be-KV for 65049@debbugs.gnu.org; Sun, 06 Aug 2023 21:09:21 -0400 Original-Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-686f94328a4so2572857b3a.0 for <65049@debbugs.gnu.org>; Sun, 06 Aug 2023 18:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691370552; x=1691975352; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=+9MVQu77lqGrthDwyvsAN0wluGEWM2amlWgHqu0lO/s=; b=be4txMWBUot8wf+4eKOfcejIFL2TdJMlZB+8qiJ0G4emXUMadde68Ag/P6wqicWgon lM4LMmGOlV1ApcVRTjTvfr8rY0duBXY/J/p5ElVOvcAGg7lNDknG702KKj4alDJGBLPM /nE9DNio0RHDS7hzyPlDQydG4PfrOrb+6sGJKqgzECqkE2/fMEmwstq2F5NwqA4CtewV I6lwRY0vNTcGZ9R1P7CiVJomiH8kF+zM+zaMoQoXuZYcA2N/L6ZaGfNJBmdKbtzIF6J8 7K3hJ6nlaXg/r4zedWzgCgeTCyGGhgqMhDNZhDx8/XMcIFZ2mXl9DYnL9xOf/LBrZkhS +Bgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691370552; x=1691975352; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+9MVQu77lqGrthDwyvsAN0wluGEWM2amlWgHqu0lO/s=; b=Rc4kxZCWa2MhwHm6MrhtKUUgtwjYcH0Ug2KJVqNar8VBLzhfZDSStlHWguCGSru7Ac N75rLAV0+WBTgakE3IqasrwyvViC6LZpmCxZCvbeA4EP3fBeowfOXDSe4L7QSSeT5Z9u CgIwKfzDGycXmKY5BDrbsZlsYKIUzZEah1zy/1mTlgrMXhbcFiqXuxqzxwjLW76sJGzl uKu1M0Fn6crBfR+pUno/NEyfAthJPig2guU+jecnyRY5itPtiG38VDoZDSiCj5OWYblY b7PlsMBafhcALjHJSGW7OOMgYXIn/GwcNh69VeVXhqjwtWqM3kw4O9rdL7alWisho+Jx 9T8A== X-Gm-Message-State: AOJu0YzoePN7FBq0n0ntn7mqEs2jEvZa5uwfj/9DJqAmxDrm9F77pgdr 3e1QnhaRGtlvEVGJ1GSwz3WwKR/aUg0= X-Google-Smtp-Source: AGHT+IHK/BQBf7juAMy2urOjmlG0j7pWUgLWBv6e2QF1hA9SxII4iXgwEWgORdAjZtM8A6DfXCxIkg== X-Received: by 2002:a05:6a00:1d92:b0:67a:72d5:3365 with SMTP id z18-20020a056a001d9200b0067a72d53365mr6173472pfw.6.1691370551468; Sun, 06 Aug 2023 18:09:11 -0700 (PDT) Original-Received: from AUWW00125 ([49.255.38.170]) by smtp.gmail.com with ESMTPSA id y5-20020aa78545000000b0064d57ecaa1dsm4934737pfn.28.2023.08.06.18.09.10 for <65049@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Aug 2023 18:09:11 -0700 (PDT) In-Reply-To: <83y1iruky1.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 04 Aug 2023 14:05:26 +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:266868 Archived-At: It looks like line ending issue, I have tried generated patch in a terminal: PS C:\Users\maxim.kim\.emacs.d> git --no-pager apply --cached ..\AppData\Local\Temp\git-patchyYAcN5 error: patch failed: init.el:1 error: init.el: patch does not apply Then added --ignore-space-change (found in https://www.delftstack.com/howto/git/git-patch-does-not-apply/#troubleshoot-git-patch-error-patch-does-not-apply and in magit issues https://github.com/magit/magit/issues/1139 plus linked https://github.com/magit/magit/issues/487#issuecomment-31727377) PS C:\Users\maxim.kim\.emacs.d> git --no-pager apply --ignore-space-change --cached ..\AppData\Local\Temp\git-patchyYAcN5 PS C:\Users\maxim.kim\.emacs.d> and git apply worked out. Then I changed line 1058 in vc-git-checkin to: (vc-git-command nil 0 patch-file "apply" "--ignore-space-change" "--cached") And now it looks like it "works", however I can see a change in line endings for the patched lines (here I have changed first line and after comitting I can see ^M there): ;;; init.el --- emacs init file -*- lexical-binding: t; -*-^M ;;; Commentary: ;; Maxim Kim ;;; Code: Not sure what a proper fix should look like though.