diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:16 -0700 |
| commit | 17952bd1bf4d758c5431eafe06059193c3977881 (patch) | |
| tree | b401581e766db96f1f0ee39ca9f08e4f78ff9b5c /builtin | |
| parent | Merge branch 'es/local-atomic-push-failure-with-http' into maint (diff) | |
| parent | clean: show an error message when the path is too long (diff) | |
| download | tgif-17952bd1bf4d758c5431eafe06059193c3977881.tar.xz | |
Merge branch 'js/clean-report-too-long-a-path' into maint
"git clean" silently skipped a path when it cannot lstat() it; now
it gives a warning.
* js/clean-report-too-long-a-path:
clean: show an error message when the path is too long
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index aaba4af3c2..d5579da716 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -34,6 +34,7 @@ static const char *msg_would_remove = N_("Would remove %s\n"); static const char *msg_skip_git_dir = N_("Skipping repository %s\n"); static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n"); static const char *msg_warn_remove_failed = N_("failed to remove %s"); +static const char *msg_warn_lstat_failed = N_("could not lstat %s\n"); enum color_clean { CLEAN_COLOR_RESET = 0, @@ -194,7 +195,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, strbuf_setlen(path, len); strbuf_addstr(path, e->d_name); if (lstat(path->buf, &st)) - ; /* fall thru */ + warning_errno(_(msg_warn_lstat_failed), path->buf); else if (S_ISDIR(st.st_mode)) { if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone)) ret = 1; |