commit 6843859a3bc6129aa748a72b6bb588d575db52cf from: Stefan Sperling date: Fri Jul 09 09:45:36 2021 UTC display recovery steps in the lonely pack index error message commit - 81ffddf9e47369641d6c4eec2f8c5c4a0a6d1b6d commit + 6843859a3bc6129aa748a72b6bb588d575db52cf blob - f571bc2b37e0f81d982871ec9029eb572253e75d blob + eab64a846eec63193c520e1b192077f1c38f24c9 --- include/got_error.h +++ include/got_error.h @@ -301,7 +301,8 @@ static const struct got_error { "version control" }, { GOT_ERR_GIT_REPO_EXT, "unsupported repository format extension" }, { GOT_ERR_CANNOT_PACK, "not enough objects to pack" }, - { GOT_ERR_LONELY_PACKIDX, "pack index has no corresponding pack file" }, + { GOT_ERR_LONELY_PACKIDX, "pack index has no corresponding pack file; " + "pack file must be restored or 'gotadmin cleanup -p' must be run" }, { GOT_ERR_OBJ_CSUM, "bad object checksum" }, }; blob - aa49076f7354432812d339a4a4f80a670dbbcacc blob + 6290a776df1e3a5e1a9e2083ba0e13f86f8ee30a --- regress/cmdline/cleanup.sh +++ regress/cmdline/cleanup.sh @@ -304,7 +304,9 @@ test_cleanup_missing_pack_file() { echo -n "gotadmin: objects/pack/pack-${packhash}.idx: " \ > $testroot/stderr.expected - echo "pack index has no corresponding pack file" \ + echo -n "pack index has no corresponding pack file; pack file must " \ + >> $testroot/stderr.expected + echo "be restored or 'gotadmin cleanup -p' must be run" \ >> $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?"