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, 22 Aug 2023 09:10:44 +1000 Message-ID: References: <83y1iruky1.fsf@gnu.org> <83il9qom6k.fsf@gnu.org> <86v8dandhq.fsf@mail.linkov.net> <83bkf1woy3.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="29165"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 65049@debbugs.gnu.org, Juri Linkov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Aug 22 01:11:26 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 1qYE3R-0007Og-DU for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 22 Aug 2023 01:11:25 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYE37-0004bx-UD; Mon, 21 Aug 2023 19:11: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 1qYE37-0004ba-6j for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 19:11:05 -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 1qYE31-0008DL-Rk for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 19:11:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYE33-0001Cs-TD for bug-gnu-emacs@gnu.org; Mon, 21 Aug 2023 19:11: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, 21 Aug 2023 23:11: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.16926594584629 (code B ref 65049); Mon, 21 Aug 2023 23:11:01 +0000 Original-Received: (at 65049) by debbugs.gnu.org; 21 Aug 2023 23:10:58 +0000 Original-Received: from localhost ([127.0.0.1]:58085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYE30-0001Cb-FT for submit@debbugs.gnu.org; Mon, 21 Aug 2023 19:10:58 -0400 Original-Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:52299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYE2z-0001CM-8S for 65049@debbugs.gnu.org; Mon, 21 Aug 2023 19:10:57 -0400 Original-Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1bdc19b782aso24252725ad.0 for <65049@debbugs.gnu.org>; Mon, 21 Aug 2023 16:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692659449; x=1693264249; 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=6JXOPiwXJZ+qtvIiTVK/6JiwATf0V96IUc5H7JPtl10=; b=m2BmH+jcougWPYwVScTvWoXCKoMpm14ToDPWjV6O7vQQoZWt/baeIaj/7esAdcSsK9 fO3HSudL36gVcJr1sgTD9Ws9TMkkZAzRYbsemVPzYSqWtM+V4raehklanNcOj7xPQdqV 6QftMuoD59eQ+dC+FlhnieKhJ4LIa/6XlrjRsdF4n0Dtk2VLB1+eBOogUH4YCx12mniQ fYBHToeLfGGOKS3eIrtU+yoeusuMpzWW6hueO8RCCavxTNvO93oAKpG1W6GWyNvQW9Kg MNZ9Id8chLm7porSZeg4eUgygBWC+1OOIF4+R6FqDfvcgCKF9hyLGpX8poHBqheP3XDx sHeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692659449; x=1693264249; 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=6JXOPiwXJZ+qtvIiTVK/6JiwATf0V96IUc5H7JPtl10=; b=HpHcOY0S79OVtjwk10O6xxlKXKZuQA9A5ytZ4KvgEleOVmPg1Q42OD5X89ZK7XvizI ctVSvVTQ6IBgwMZJgTEqrx6sjQIX4k6EExQivO7ookDBp7mMHTJg9wX0c1WlFYmCPodM 9J22EaBeVBm0iDrwYY8Xf2B3rfQOmqBKICELetFiDjjdW32kmVTyzmvqqF+qDjf+bWyc 50YVgUD470YnPSvkwqRNRzacXZDtA7KttvZkmwthe6LrX0xuOKh0c/PAWaraAfJPK7S6 zY9WzG2NvTa+AhwH9M5QIN9mqz6yCnIS6RvFQhcUUOQfuVf8/V9cvyaJ9qUe+rGdJlk+ KhzQ== X-Gm-Message-State: AOJu0YxC67baldyjSbLRjxW4nHATXqgdh1P9pAD+nyjeTUK0o495mu4Y bxlP084uU4mLK23hl5r2cpBtBlGQkFk= X-Google-Smtp-Source: AGHT+IHyIwXaKIrVX56nALg/PPW/K8LslPOMqjAhIrUxLmk3bqeu6DoQ0/KdBT1fLYiWlBBxMZC3qQ== X-Received: by 2002:a17:902:8684:b0:1b7:f99f:63c9 with SMTP id g4-20020a170902868400b001b7f99f63c9mr4834948plo.67.1692659448509; Mon, 21 Aug 2023 16:10:48 -0700 (PDT) Original-Received: from AUWW00125 ([202.138.73.130]) by smtp.gmail.com with ESMTPSA id d2-20020a170902cec200b001bdc66478c1sm7491716plg.309.2023.08.21.16.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 16:10:48 -0700 (PDT) In-Reply-To: <83bkf1woy3.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 20 Aug 2023 21:25:56 +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:268126 Archived-At: Eli Zaretskii writes: > Then this should set up EOL conversion correctly for the temporary > file. Something like (untested): > > (let ((patch-file (make-nearby-temp-file "git-patch"))) > (with-temp-file patch-file > (insert vc-git-patch-string) > (set-buffer-file-coding-system 'unix))) > (unwind-protect > (vc-git-command nil 0 patch-file "apply" "--cached") This didn't help, I get exact same error. File I am changing has: U -- utf-8-unix (alias: mule-utf-8-unix cp65001-unix) UTF-8 (no signature (BOM)) Type: utf-8 (UTF-8: Emacs internal multibyte form) EOL type: LF This coding system encodes the following charsets: unicode Current ~/.gitconfig: [user] name = Maxim Kim email = habamax@gmail.com [core] autocrlf = false quotepath = off [credential] helper = manager-core [commit] verbose = true [pull] rebase = true [github] user = habamax In fact, I get the same error with the fresh repo: 1. mkdir ~/prj/test 2. cd ~/prj/test 3. git init 4. open emacs and create a new text file with "hello" line. 5. C-x v v to register it in vc 6. C-x v v for vc-log, add summary, commit with C-c C-c 7. Add a new line to text file, save 8. C-x v D to get vc-root-diff 9. C-x v v for vc-log and add Summary 10. C-c C-c to commit And it fails even though autocrlf=false and the file in question has LF. With or without the patch.