Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty

2012-12-10 Thread Junio C Hamano
Johannes Schindelin writes: > 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. OK, then I'll queue the following to my tree. Thanks for a quick turnaround. -- >8 -- From: Erik Faye-Lund Date: Mon, 10 Dec 20

Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty

2012-12-10 Thread Johannes Schindelin
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

Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty

2012-12-10 Thread Erik Faye-Lund
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 slight

Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty

2012-12-10 Thread Junio C Hamano
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 falli

[PATCHv2] mingw_rmdir: do not prompt for retry when non-empty

2012-12-10 Thread Erik Faye-Lund
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