From: Linus Torvalds <torvalds@linux-foundation.org>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: Small "git clean" annoyance
Date: Fri, 1 Apr 2011 07:48:12 -0700 [thread overview]
Message-ID: <AANLkTinD=Zx0tdY53n8mXvpufCUr96v0u1DbzasRXMfY@mail.gmail.com> (raw)
In-Reply-To: <AANLkTikksQj3HfOJmi-uZTfc7sTNNuDA4bFVaj2cY3Ad@mail.gmail.com>
On Fri, Apr 1, 2011 at 12:34 AM, Alex Riesen <raa.lkml@gmail.com> wrote:
>
> Something like this?
>
> diff --git a/dir.c b/dir.c
> index 325fb56..7251426 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1191,8 +1191,11 @@ int remove_dir_recursively(struct strbuf *path, int flag)
> return 0;
>
> dir = opendir(path->buf);
> - if (!dir)
> + if (!dir) {
> + if (rmdir(path->buf) == 0)
> + return 0;
> return -1;
> + }
Heh. My minimalist sensibilities go "yuck", and say that you should just do
if (!dir)
return rmdir(path->buf);
instead.
But not a big deal. Looks fine, and fixes the trivial annoyance.
I'd still like the better error message. With "rm -rf" I get good
error messages even for the complex case:
[torvalds@i5 git]$ mkdir tmp
[torvalds@i5 git]$ mkdir tmp/tmp
[torvalds@i5 git]$ chmod -w tmp
[torvalds@i5 git]$ rm -rf tmp
rm: cannot remove `tmp/tmp': Permission denied
but "git clean" says:
[torvalds@i5 git]$ git clean -dqfx
warning: failed to remove tmp/
Hmm.
Adding the obvious "strerror(errno)" to builtin/clean.c just changes it to
warning: failed to remove tmp/ (Permission denied)
which I guess is better, but not entirely obvious (it's "tmp/tmp" that
failed to remove due to permissions, but clean.c only sees/cares about
the uppermost level)
But it's probably not worth worrying about any more. The simple
one-liner rmdir() looks worth it.
Linus
prev parent reply other threads:[~2011-04-01 15:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 22:01 Small "git clean" annoyance Linus Torvalds
2011-04-01 7:34 ` Alex Riesen
2011-04-01 7:41 ` Matthieu Moy
2011-04-01 8:29 ` Erik Faye-Lund
2011-04-01 9:20 ` Alex Riesen
2011-04-01 14:48 ` Linus Torvalds [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTinD=Zx0tdY53n8mXvpufCUr96v0u1DbzasRXMfY@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=raa.lkml@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).