[PATCH] perf: work around the tested repo having an index.lock
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 2, 2017, 10:33 UTC
- Message-ID
- <20170602103330.25663-1-avarab@gmail.com>
When the tested repo has an index.lock file it should be removed. This file may be present if e.g. git-status previously crashed in that repo, and it will make a lot of git commands fail. Let's try harder and remove the lock.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/perf/perf-lib.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index b6fc880395..b50211b259 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -108,7 +108,14 @@ test_perf_create_repo_from () { cd "$repo" && "$MODERN_GIT" init -q && test_perf_do_repo_symlink_config_ && - mv .git/hooks .git/hooks-disabled 2>/dev/null + mv .git/hooks .git/hooks-disabled 2>/dev/null && + if test -f .git/index.lock + then + # We may be copying a repo that can't run "git + # status" due to a locked index. Since we have + # a copy it's fine to remove the lock. + rm .git/index.lock + fi ) || error "failed to copy repository '$source' to '$repo'" }
-- 2.13.0.506.g27d5fe0cd