From: Junio C Hamano Date: Thu, 25 May 2017 23:33:46 GMT Subject: Re: `pull --rebase --autostash` fails when fast forward in dirty repo Message-ID: In-Reply-To: <20170525182230.552dif62zqxuufk3@sigill.intra.peff.net> Jeff King writes: > Anyway. All this has shown me is that it's probably pointless to do this > timing at all on Linux. Somebody on Windows might get better results. > > But regardless, we need to do something. Correctness must trump > optimizations, and the question is whether we can throw out the whole > conditional, or if we should just restrict when it kicks in. Yes. I personally do not mind going with the simplest approach. The optimization thing is relatively new and we were perfectly happy without it before ;-).