Junio C Hamano <gitster@xxxxxxxxx> writes:
>> The other warnings in that function are issued using warning_errno()
>> (shorter code, consistency is enforced) and messages are marked for
>> translation. That would be nice to have here as well, no?
>
> Absolutely. Also, downcase "Could" and perhaps use _() around.
This one is easy enough (not just in the technical sense, but in the
sense that it has little room wasting our time bikeshedding), so
let's tie the loose ends and move on.
I was tempted to fix the proposed log message to excise exaggeration
(I prefer not to see "very", "important", etc.---other things that
is said in the message should be enough to convince readers about
the importance), but didn't.
What I did do was to not just rephrasing the warning message, but to
give it its own constant and to feed it to warning_errno(), to match
the other warning message.
I also saved one (or perhaps two) fork(s) from the test script ;-)
and added a portability note there.
1: d93f701a2e ! 1: b1e100aa6a clean: show an error message when the path is too long
@@ Metadata
## Commit message ##
clean: show an error message when the path is too long
- Without an error message when stat() failed, e.g. `git clean` would
+ Without an error message when lstat() failed, `git clean` would
abort without an error message, leaving the user quite puzzled.
In particular on Windows, where the default maximum path length is quite
@@ Commit message
https://github.com/git-for-windows/git/issues/521
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
+ [jc: matched the warning message style to existing ones, fixed test]
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
## builtin/clean.c ##
+@@ builtin/clean.c: 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,
@@ builtin/clean.c: 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("Could not stat path '%s': %s",
-+ path->buf, strerror(errno));
++ 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;
@@ t/t7300-clean.sh: test_expect_success 'git clean -d skips untracked dirs contain
+ test_when_finished git config --unset core.longpaths &&
+ a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+ mkdir -p $a50$a50/$a50$a50/$a50$a50 &&
-+ touch $a50$a50/test.txt &&
-+ touch $a50$a50/$a50$a50/$a50$a50/test.txt &&
++ : >"$a50$a50/test.txt" 2>"$a50$a50/$a50$a50/$a50$a50/test.txt" &&
++ # create a temporary outside the working tree to hide from "git clean"
+ test_must_fail git clean -xdf 2>.git/err &&
-+ grep "too long" .git/err
++ # grepping for a strerror string is unportable but it is OK here with
++ # MINGW prereq
++ test_i18ngrep "too long" .git/err
+'
+
test_done
-- >8 --
From: Johannes Schindelin <johannes.schindelin@xxxxxx>
Subject: [PATCH] clean: show an error message when the path is too long
Without an error message when lstat() failed, `git clean` would
abort without an error message, leaving the user quite puzzled.
In particular on Windows, where the default maximum path length is quite
small (yet there are ways to circumvent that limit in many cases), it is
very important that users be given an indication why their command
failed because of too long paths when it did.
This test case makes sure that a warning is issued that would have
helped the user who reported this issue:
https://github.com/git-for-windows/git/issues/521
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
[jc: matched the warning message style to existing ones, fixed test]
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/clean.c | 3 ++-
t/t7300-clean.sh | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
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;
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 7b36954d63..bde55b358c 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -669,4 +669,17 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files'
test_path_is_missing foo/b/bb
'
+test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
+ git config core.longpaths false &&
+ test_when_finished git config --unset core.longpaths &&
+ a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+ mkdir -p $a50$a50/$a50$a50/$a50$a50 &&
+ : >"$a50$a50/test.txt" 2>"$a50$a50/$a50$a50/$a50$a50/test.txt" &&
+ # create a temporary outside the working tree to hide from "git clean"
+ test_must_fail git clean -xdf 2>.git/err &&
+ # grepping for a strerror string is unportable but it is OK here with
+ # MINGW prereq
+ test_i18ngrep "too long" .git/err
+'
+
test_done
--
2.22.0-653-g37fc7794bc
