summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:02 (GMT)
commit993fa5625876306ff1de0cbc5d70fc1b232568b9 (patch)
tree3b189efca15713a184fa054404745626d9306c6b /builtin/gc.c
parent99913dd11809b2a5d6a4644c52bc795d124d48e0 (diff)
parent3029970275b473dbf62149887a19a6b4879528d7 (diff)
downloadgit-993fa5625876306ff1de0cbc5d70fc1b232568b9.zip
git-993fa5625876306ff1de0cbc5d70fc1b232568b9.tar.gz
git-993fa5625876306ff1de0cbc5d70fc1b232568b9.tar.bz2
Merge branch 'jn/gc-auto'
"gc --auto" ended up calling exit(-1) upon error, which has been corrected to use exit(1). Also the error reporting behaviour when daemonized has been updated to exit with zero status when stopping due to a previously discovered error (which implies there is no point running gc to improve the situation); we used to exit with failure in such a case. * jn/gc-auto: gc: do not return error for prior errors in daemonized mode
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c33
1 files changed, 27 insertions, 6 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 705c3d3..871a56f 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -441,9 +441,15 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
return NULL;
}
-static void report_last_gc_error(void)
+/*
+ * Returns 0 if there was no previous error and gc can proceed, 1 if
+ * gc should not proceed due to an error in the last run. Prints a
+ * message and returns -1 if an error occured while reading gc.log
+ */
+static int 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");
@@ -452,7 +458,8 @@ static void report_last_gc_error(void)
if (errno == ENOENT)
goto done;
- die_errno(_("cannot stat '%s'"), gc_log_path);
+ ret = error_errno(_("cannot stat '%s'"), gc_log_path);
+ goto done;
}
if (st.st_mtime < gc_log_expire_time)
@@ -460,18 +467,26 @@ static void report_last_gc_error(void)
len = strbuf_read_file(&sb, gc_log_path, 0);
if (len < 0)
- die_errno(_("cannot read '%s'"), gc_log_path);
- else if (len > 0)
- die(_("The last gc run reported the following. "
+ ret = error_errno(_("cannot read '%s'"), gc_log_path);
+ else if (len > 0) {
+ /*
+ * A previous gc failed. Report the error, and don't
+ * bother with an automatic gc run since it is likely
+ * to fail in the same way.
+ */
+ warning(_("The last gc run reported the following. "
"Please correct the root cause\n"
"and remove %s.\n"
"Automatic cleanup will not be performed "
"until the file is removed.\n\n"
"%s"),
gc_log_path, sb.buf);
+ ret = 1;
+ }
strbuf_release(&sb);
done:
free(gc_log_path);
+ return ret;
}
static void gc_before_repack(void)
@@ -564,7 +579,13 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
fprintf(stderr, _("See \"git help gc\" for manual housekeeping.\n"));
}
if (detach_auto) {
- report_last_gc_error(); /* dies on error */
+ int ret = report_last_gc_error();
+ if (ret < 0)
+ /* an I/O error occured, already reported */
+ exit(128);
+ if (ret == 1)
+ /* Last gc --auto failed. Skip this one. */
+ return 0;
if (lock_repo_for_gc(force, &pid))
return 0;