From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Derrick Stolee" <stolee@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 3/3] sha1-file: change alternate "error:" message to "warning:"
Date: Tue, 4 Dec 2018 14:27:16 +0100 [thread overview]
Message-ID: <20181204132716.19208-4-avarab@gmail.com> (raw)
In-Reply-To: <87tvjtvah0.fsf@evledraar.gmail.com>
Change the "error" message emitted by alt_odb_usable() to be a
"warning" instead. As noted in commits leading up to this one this has
never impacted the exit code ever since the check was initially added
in 26125f6b9b ("detect broken alternates.", 2006-02-22).
It's confusing to emit an "error" when e.g. "git fsck" will exit with
0, so let's emit a "warning:" instead.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
sha1-file.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sha1-file.c b/sha1-file.c
index f142f81658..4b9b63bdcb 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -378,17 +378,17 @@ static int alt_odb_usable(struct raw_object_store *o,
if (!is_directory(path->buf)) {
/* Detect cases where alternate disappeared */
- error(_("object directory %s does not exist; "
- "check .git/objects/info/alternates"),
- path->buf);
+ warning(_("object directory %s does not exist; "
+ "check .git/objects/info/alternates"),
+ path->buf);
return 0;
} else if (is_directory(mkpath("%s/objects", path->buf)) ||
is_directory(mkpath("%s/.git/objects", path->buf))) {
/* Detect cases where alternate is a git repository */
- error(_("object directory %s looks like a git repository; "
- "alternates must point to the 'objects' directory. "
- "check .git/objects/info/alternates"),
- path->buf);
+ warning(_("object directory %s looks like a git repository; "
+ "alternates must point to the 'objects' directory. "
+ "check .git/objects/info/alternates"),
+ path->buf);
return 0;
}
--
2.20.0.rc2.403.gdbc3b29805
next prev parent reply other threads:[~2018-12-04 13:27 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 14:59 How de-duplicate similar repositories with alternates Ævar Arnfjörð Bjarmason
2018-11-29 16:09 ` Ævar Arnfjörð Bjarmason
2018-11-29 18:55 ` Stefan Beller
2018-11-29 20:10 ` Ævar Arnfjörð Bjarmason
2018-11-29 20:43 ` Duy Nguyen
2018-12-04 7:06 ` Jeff King
2018-12-04 12:07 ` Derrick Stolee
2018-12-04 6:59 ` Jeff King
2018-12-04 10:43 ` Ævar Arnfjörð Bjarmason
2018-12-04 13:27 ` [PATCH 0/3] sha1-file: warn if alternate is a git repo (not object dir) Ævar Arnfjörð Bjarmason
2018-12-04 13:27 ` [PATCH 1/3] sha1-file: test the error behavior of alt_odb_usable() Ævar Arnfjörð Bjarmason
2019-03-28 20:04 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2019-03-29 13:46 ` Jeff King
2019-03-29 13:55 ` Ævar Arnfjörð Bjarmason
2019-04-08 15:57 ` Ævar Arnfjörð Bjarmason
2019-04-09 8:21 ` Junio C Hamano
2019-04-09 8:45 ` Ævar Arnfjörð Bjarmason
2019-04-09 9:43 ` Junio C Hamano
2019-04-09 14:14 ` Jeff King
2019-04-09 8:29 ` Junio C Hamano
2018-12-04 13:27 ` [PATCH 2/3] sha1-file: emit error if an alternate looks like a repository Ævar Arnfjörð Bjarmason
2018-12-05 3:35 ` Junio C Hamano
2018-12-05 6:10 ` Jeff King
2018-12-04 13:27 ` Ævar Arnfjörð Bjarmason [this message]
2018-12-05 3:37 ` [PATCH 3/3] sha1-file: change alternate "error:" message to "warning:" Junio C Hamano
2018-12-05 5:54 ` Jeff King
2018-12-05 3:30 ` How de-duplicate similar repositories with alternates Junio C Hamano
2018-12-04 13:35 ` Ævar Arnfjörð Bjarmason
2018-12-04 14:17 ` Derrick Stolee
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=20181204132716.19208-4-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=stolee@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).