GNU bug report logs - #60126
30.0.50; vc-git-checkin: Offer to unstage conflicting changes

Previous Next

Package: emacs;

Reported by: Sean Whitton <spwhitton <at> spwhitton.name>

Date: Fri, 16 Dec 2022 18:34:01 UTC

Severity: normal

Found in version 30.0.50

Done: Sean Whitton <spwhitton <at> spwhitton.name>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: juri <at> linkov.net, 60126 <at> debbugs.gnu.org, dgutov <at> yandex.ru
Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes
Date: Fri, 23 Dec 2022 19:03:11 -0700
Hello,

On Fri 23 Dec 2022 at 10:16AM +02, Eli Zaretskii wrote:

>> Cc: 60126 <at> debbugs.gnu.org, juri <at> linkov.net
>> From: Sean Whitton <spwhitton <at> spwhitton.name>
>> Date: Thu, 22 Dec 2022 20:59:53 -0700
>>
>> +        ;; Prepare stash commit object, which has a special structure.
>> +        (let* ((tree-commit (git-string "commit-tree" "-m" message
>
> Can 'message' include newlines? if so, we need to either convert the
> newlines to spaces, or invoke the command with -F instead, writing the
> message to a temporary file.  Because otherwise this will fail on
> Windows.

Ah, thank you.

These "messages" are more like labels, or names, than commit messages.
I've gone ahead and hard coded it for the time being.

-- 
Sean Whitton




This bug report was last modified 2 years and 150 days ago.

Previous Next


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