From ffb79d917eae52b86b8c7079b93e8ddfe9b9c69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samo=20Poga=C4=8Dnik?= Date: Sun, 17 Nov 2024 18:49:23 +0100 Subject: [PATCH] Fixing error.t in github checks --- Makefile | 2 +- lib/git-subrepo | 3 ++- test/error.t | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cee2f456..6cf13bca 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ help: .PHONY: test test: - prove $(prove) $(test) + prove $(prove) -v $(test) test-all: test docker-tests diff --git a/lib/git-subrepo b/lib/git-subrepo index 00487e4f..357ff4c3 100755 --- a/lib/git-subrepo +++ b/lib/git-subrepo @@ -1534,7 +1534,8 @@ assert-repo-is-ready() { [[ $command =~ ^(help|version|upgrade)$ ]] && return # We must be inside a git repo: - git rev-parse --git-dir &> /dev/null || +#orig: git rev-parse --git-dir &> /dev/null || + git rev-parse --git-dir || error "Not inside a git repository." # Get the original branch and commit: diff --git a/test/error.t b/test/error.t index 8604c1cf..4d89c365 100644 --- a/test/error.t +++ b/test/error.t @@ -115,6 +115,7 @@ clone-foo-and-bar ) } +pwd { is "$( cd .git