GNU bug report logs - #20292
24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

Previous Next

Full log

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

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: esr <at> snark.thyrsus.com, Eli Zaretskii <eliz <at> gnu.org>, 20292 <at> debbugs.gnu.org
Subject: Re: bug#20292: 24.5;
 Saving Git-controlled file with merge conflicts after "stash pop"
 stages the file
Date: Sat, 16 May 2015 09:53:12 -0400

> If we're fine with a config var, we might as well try to support the
> alternative behavior. This should do it:

Looks OK to me.

> +  :group 'vc-git)

This is redundant.

> +      (when (and
> +             (eq vc-git-resolve-conflicts 'unstage)
> +             ;; Doing something other than a merge.  Likely applying a
> +             ;; stash (bug#20292).
> +             (not
> +              (file-exists-p (expand-file-name ".git/MERGE_HEAD"
> +                                               (vc-git-root
> buffer-file-name))))
> +             (not (vc-git-conflicted-files (vc-git-root
> buffer-file-name))))

If you switch to "(unless (or ..." you'll get rid of one "not".


        Stefan

Previous Next

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