GNU bug report logs - #65049
29.1; vc-do-command fails in windows emacs 29.1

Previous Next

Full log

Message #38 received at 65049 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Juri Linkov <juri <at> linkov.net>
Cc: habamax <at> gmail.com, 65049 <at> debbugs.gnu.org
Subject: Re: bug#65049: Minor update to the repro steps
Date: Sun, 20 Aug 2023 21:25:56 +0300

> From: Juri Linkov <juri <at> linkov.net>
> Cc: Maxim Kim <habamax <at> gmail.com>,  65049 <at> debbugs.gnu.org
> Date: Sun, 20 Aug 2023 19:49:53 +0300
> 
> > 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.
> 
> It's created in 'vc-git-checkin':
> 
>         (let ((patch-file (make-nearby-temp-file "git-patch")))
>           (with-temp-file patch-file
>             (insert vc-git-patch-string))
>           (unwind-protect
>               (vc-git-command nil 0 patch-file "apply" "--cached")

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")

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.