Re: Dangerous "git am --abort" behavior
- From
Peter Krefting <peter@softwolves.pp.se>
- Date
- Dec 22, 2010, 09:49 UTC
- Message-ID
- <alpine.DEB.2.00.1012221046100.24315@ds9.cixit.se>
- In-Reply-To
- <AANLkTinP4SArMkjvTXOEG=tf=8EcEdP9fPAB7F=iitSc@mail.gmail.com>
Linus Torvalds:
> I just noticed this, and I wonder if it has bitten me before without > me noticing: "git am --abort" can be really dangerous.
Indeed, I have been bitten by that several times, having worked heavily on applying patches at $dayjob for a while now. I have taken to habit to always do the same "rm -rf .git/rebase-apply" that you mention before doing anything involving am or rebase...
> Or maybe we could just introduce a new "git am --clean" that just flushes > any old pending state (ie does that "clean_abort" thing, which is > basically just the "rm -rf" I've done by hand).
That would be very helpful, as manually doing a "rm -rf" inside the .git directory does make me nervous each time I do it...
-- \\// Peter - http://www.softwolves.pp.se/