From: Johannes Schindelin Date: Mon, 10 Dec 2012 17:05:30 GMT Subject: Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty Message-ID: In-Reply-To: Hi kusma, On Mon, 10 Dec 2012, Erik Faye-Lund wrote: > On Mon, Dec 10, 2012 at 5:25 PM, Junio C Hamano wrote: > > Erik Faye-Lund writes: > > > >> in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"), a > >> check was added to prevent us from retrying to delete a directory > >> that is both in use and non-empty. > >> > >> However, this logic was slightly flawed; since we didn't return > >> immediately, we end up falling out of the retry-loop, but right into > >> the prompting-loop. > >> > >> Fix this by setting errno, and guarding the prompting-loop with an > >> errno-check. > >> > >> Signed-off-by: Erik Faye-Lund > >> --- > >> > >> Here's the second version of this patch, sorry for the slight delay. > > > > Is this meant for me, or is it to be applied to msysgit and later > > somehow fed to me in different form? > > > > I can s/_wrmdir/rmdir/;s/wpathname/pathname/ if that is what you > > want me to do, but otherwise this patch does not apply. > > > > Ugh, you are right. I intended for you to apply it, but I didn't realize > that my patch was based on the msysGit-master, where Karsten's UTF-8 > patches has been applied. > > I'm not entirely sure what the best approach would be. The issue is > present in both branches, but we only build installers from the > msysGit-branch. But I think there are other people who builds Git from > the upstream source code, so it would be slightly less annoying for them > if the patch was fixed up and applied. But on the other hand, that > causes some annoyance when (if?) Karsten's UTF-8 patches gets > upstreamed. > > Thoughts? My preference would be to fix it in both branches. I will fix the merge conflicts when rebasing onto Junio's master branch next time. Ciao, Dscho -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en