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

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

From: Sean Whitton <spwhitton <at> spwhitton.name>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 60126 <at> debbugs.gnu.org, juri <at> linkov.net
Subject: Re: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage
 conflicting changes
Date: Mon, 19 Dec 2022 15:30:17 -0700

Hello,

On Sun 18 Dec 2022 at 03:08AM +02, Dmitry Gutov wrote:

> Perhaps we should offer to stash the changes, though?
>
> Starting with Git 2.13, 'git stash' now has the 'push' subcommand which
> accepts individual file names:
>
>   https://stackoverflow.com/a/5506483/615245
>
> Or make it a three-way choice with read-multiple-choice.

This is a nice suggestion.  A step further would be to unconditionally
stash and unstash.  Given how committing patches with C-x v v works, I
don't believe it can ever be the case that the stash is not applicable
afterwards?  If that's wrong, I'll implement what you suggest.

-- 
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.