On Mon, 5 Aug 2013 20:34:17 +0530, Ramkumar Ramachandra <[email protected]>
wrote:
> Pieter Praet wrote:
> > On Sat, 3 Aug 2013 02:10:27 +0530, Ramkumar Ramachandra
> > <[email protected]> wrote:
> >> [...] Note that --abort can have unpleasant
> >> consequences when merge is run on a dirty worktree.
> >
> > Which is why `magit-merge-abort' is bound to a capital "A" instead
> > of lowercase *and* we're prompted "Abort merge?" before our work
> > receives a one-way ticket to digital oblivion. :)
> >
> > Unless I misinterpreted that?
>
> Yeah, see git-merge(1):
>
> --abort::
> Abort the current conflict resolution process, and
> try to reconstruct the pre-merge state.
> +
> If there were uncommitted worktree changes present when the merge
> started, 'git merge --abort' will in some cases be unable to
> reconstruct these changes. It is therefore recommended to always
> commit or stash your changes before running 'git merge'.
> +
> [...]
Ah. Well... if people start a merge in a dirty worktree and it
blows up in their face, they only have themselves to blame :)
Maybe we could wrap something like:
#+begin_src emacs-lisp
(unless (magit-everything-clean-p)
(yes-or-no-p
(format
"Attempting to run '%s' in a dirty worktree. Ruin your day?"
op)))
#+end_src
... around the potentially offending functions.
> > I tend to avoid release candidates of essential software though,
> > so I'll look into it when I git me some fresh (stable) git.
>
> git.git master is very stable: many of us use it for day-to-day development.
No doubt about it, but whether you like it or not, issues do tend to
slip in, more or less directly proportional to the amount of changed
code. Or maybe I'm just looking for excuses to get a break from the
constant upgrade-rinse-repeat cycle once in a while. :)
Peace
--
Pieter
--
---
You received this message because you are subscribed to the Google Groups
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
