From: Jonathan Nieder <jrnieder@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"Elijah Newren" <newren@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/3] gc: exit with status 128 on failure
Date: Mon, 16 Jul 2018 23:54:16 -0700 [thread overview]
Message-ID: <20180717065416.GC177907@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20180717065151.GA177907@aiede.svl.corp.google.com>
A value of -1 returned from cmd_gc gets propagated to exit(),
resulting in an exit status of 255. Use die instead for a clearer
error message and a controlled exit.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
As in
https://public-inbox.org/git/20180716225639.GK11513@aiede.svl.corp.google.com/.
The only change is splitting out patch 1/3.
builtin/gc.c | 35 ++++++++++++++---------------------
t/t6500-gc.sh | 2 +-
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index d69fc4c0b0..95c8afd07b 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -438,10 +438,9 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
return NULL;
}
-static int report_last_gc_error(void)
+static void report_last_gc_error(void)
{
struct strbuf sb = STRBUF_INIT;
- int ret = 0;
ssize_t len;
struct stat st;
char *gc_log_path = git_pathdup("gc.log");
@@ -450,8 +449,7 @@ static int report_last_gc_error(void)
if (errno == ENOENT)
goto done;
- ret = error_errno(_("cannot stat '%s'"), gc_log_path);
- goto done;
+ die_errno(_("cannot stat '%s'"), gc_log_path);
}
if (st.st_mtime < gc_log_expire_time)
@@ -459,9 +457,9 @@ static int report_last_gc_error(void)
len = strbuf_read_file(&sb, gc_log_path, 0);
if (len < 0)
- ret = error_errno(_("cannot read '%s'"), gc_log_path);
+ die_errno(_("cannot read '%s'"), gc_log_path);
else if (len > 0)
- ret = error(_("The last gc run reported the following. "
+ die(_("The last gc run reported the following. "
"Please correct the root cause\n"
"and remove %s.\n"
"Automatic cleanup will not be performed "
@@ -471,20 +469,18 @@ static int report_last_gc_error(void)
strbuf_release(&sb);
done:
free(gc_log_path);
- return ret;
}
-static int gc_before_repack(void)
+static void gc_before_repack(void)
{
if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, pack_refs_cmd.argv[0]);
+ die(FAILED_RUN, pack_refs_cmd.argv[0]);
if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, reflog.argv[0]);
+ die(FAILED_RUN, reflog.argv[0]);
pack_refs = 0;
prune_reflogs = 0;
- return 0;
}
int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -565,13 +561,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
fprintf(stderr, _("See \"git help gc\" for manual housekeeping.\n"));
}
if (detach_auto) {
- if (report_last_gc_error())
- return -1;
+ report_last_gc_error(); /* dies on error */
if (lock_repo_for_gc(force, &pid))
return 0;
- if (gc_before_repack())
- return -1;
+ gc_before_repack(); /* dies on failure */
delete_tempfile(&pidfile);
/*
@@ -611,12 +605,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
atexit(process_log_file_at_exit);
}
- if (gc_before_repack())
- return -1;
+ gc_before_repack();
if (!repository_format_precious_objects) {
if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, repack.argv[0]);
+ die(FAILED_RUN, repack.argv[0]);
if (prune_expire) {
argv_array_push(&prune, prune_expire);
@@ -626,18 +619,18 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
argv_array_push(&prune,
"--exclude-promisor-objects");
if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, prune.argv[0]);
+ die(FAILED_RUN, prune.argv[0]);
}
}
if (prune_worktrees_expire) {
argv_array_push(&prune_worktrees, prune_worktrees_expire);
if (run_command_v_opt(prune_worktrees.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, prune_worktrees.argv[0]);
+ die(FAILED_RUN, prune_worktrees.argv[0]);
}
if (run_command_v_opt(rerere.argv, RUN_GIT_CMD))
- return error(FAILED_RUN, rerere.argv[0]);
+ die(FAILED_RUN, rerere.argv[0]);
report_garbage = report_pack_garbage;
reprepare_packed_git(the_repository);
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 818435f04e..c474a94a9f 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -117,7 +117,7 @@ test_expect_success 'background auto gc does not run if gc.log is present and re
test_config gc.autodetach true &&
echo fleem >.git/gc.log &&
test_must_fail git gc --auto 2>err &&
- test_i18ngrep "^error:" err &&
+ test_i18ngrep "^fatal:" err &&
test_config gc.logexpiry 5.days &&
test-tool chmtime =-345600 .git/gc.log &&
test_must_fail git gc --auto &&
--
2.18.0.233.g985f88cf7e
next prev parent reply other threads:[~2018-07-17 6:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 17:27 [PATCH] gc: do not warn about too many loose objects Jonathan Tan
2018-07-16 17:51 ` Jeff King
2018-07-16 18:22 ` Jonathan Nieder
2018-07-16 18:52 ` Jeff King
2018-07-16 19:09 ` Jonathan Nieder
2018-07-16 19:41 ` Jeff King
2018-07-16 19:54 ` Jonathan Nieder
2018-07-16 20:29 ` Jeff King
2018-07-16 20:37 ` Jonathan Nieder
2018-07-16 21:09 ` Jeff King
2018-07-16 21:40 ` Jonathan Nieder
2018-07-16 21:45 ` Jeff King
2018-07-16 22:03 ` Jonathan Nieder
2018-07-16 22:43 ` Jeff King
2018-07-16 22:56 ` Jonathan Nieder
2018-07-16 23:26 ` Jeff King
2018-07-17 1:53 ` Jonathan Nieder
2018-07-17 8:59 ` Ævar Arnfjörð Bjarmason
2018-07-17 14:03 ` Jonathan Nieder
2018-07-17 15:24 ` Ævar Arnfjörð Bjarmason
2018-07-17 20:27 ` Jeff King
2018-07-18 13:11 ` Ævar Arnfjörð Bjarmason
2018-07-18 17:29 ` Jeff King
2018-07-17 15:59 ` Duy Nguyen
2018-07-17 18:09 ` Junio C Hamano
2018-07-16 19:15 ` Elijah Newren
2018-07-16 19:19 ` Jonathan Nieder
2018-07-16 20:21 ` Elijah Newren
2018-07-16 20:35 ` Jeff King
2018-07-16 20:56 ` Jonathan Nieder
2018-07-16 21:12 ` Jeff King
2018-07-16 19:52 ` Jeff King
2018-07-16 20:16 ` Elijah Newren
2018-07-16 20:38 ` Jeff King
2018-07-16 21:09 ` Elijah Newren
2018-07-16 21:21 ` Jeff King
2018-07-16 22:07 ` Elijah Newren
2018-07-16 22:55 ` Jeff King
2018-07-16 23:06 ` Elijah Newren
2018-07-16 21:31 ` Jonathan Nieder
2018-07-17 6:51 ` [PATCH v2 0/3] gc --auto: do not return error for prior errors in daemonized mode Jonathan Nieder
2018-07-17 6:53 ` [PATCH 1/3] gc: improve handling of errors reading gc.log Jonathan Nieder
2018-07-17 18:19 ` Junio C Hamano
2018-07-17 19:58 ` Jeff King
2018-07-17 6:54 ` Jonathan Nieder [this message]
2018-07-17 18:22 ` [PATCH 2/3] gc: exit with status 128 on failure Junio C Hamano
2018-07-17 19:59 ` Jeff King
2018-09-17 18:33 ` Jeff King
2018-09-17 18:40 ` Jonathan Nieder
2018-09-18 17:30 ` Jeff King
2018-07-17 6:57 ` [PATCH 3/3] gc: do not return error for prior errors in daemonized mode Jonathan Nieder
2018-07-17 20:13 ` Jeff King
2018-07-18 16:21 ` Junio C Hamano
2018-07-18 17:22 ` Jeff King
2018-07-18 18:19 ` Junio C Hamano
2018-07-18 19:06 ` Jeff King
2018-07-18 19:55 ` Junio C Hamano
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=20180717065416.GC177907@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).