diff options
| -rw-r--r-- | cgitize/cgit.py | 8 | ||||
| -rwxr-xr-x | test/integration/local/test.sh | 30 |
2 files changed, 1 insertions, 37 deletions
diff --git a/cgitize/cgit.py b/cgitize/cgit.py index 1fbddb7..c525214 100644 --- a/cgitize/cgit.py +++ b/cgitize/cgit.py @@ -166,10 +166,4 @@ class CGitRepositories: repo_dir = self.get_repo_dir(repo) with chdir(repo_dir): with Git.setup_auth(repo): - if not Git.check('remote', 'update', '--prune'): - return False - # In case the local repository is not a bare repository, but a - # full-fledged working copy: - if Git.check('rev-parse', '--verify', '--quiet', 'origin/master'): - return Git.check('reset', '--soft', 'origin/master') - return True + return Git.check('remote', 'update', '--prune') diff --git a/test/integration/local/test.sh b/test/integration/local/test.sh index dbed2e1..04208ab 100755 --- a/test/integration/local/test.sh +++ b/test/integration/local/test.sh @@ -107,18 +107,6 @@ setup_bare() { setup_cgitize } -setup_workdir() { - setup_bare - - echo - echo ---------------------------------------------------------------------- - echo Setting up local repository clone - echo ---------------------------------------------------------------------- - - mkdir -p -- "$output_dir" - _git clone --quiet -- "$upstream_repo_dir" "$output_dir/test_repo" -} - cgitize() { echo echo ---------------------------------------------------------------------- @@ -216,23 +204,6 @@ test_bare() { success } -test_workdir() { - echo - echo ====================================================================== - echo "${FUNCNAME[0]}" - echo ====================================================================== - - setup_workdir - cgitize - verify_initial_commits - add_commits - cgitize - verify_added_commits - verify_error_header_empty - cleanup - success -} - test_failure() { echo echo ====================================================================== @@ -267,7 +238,6 @@ test_failure() { main() { trap cleanup EXIT test_bare - test_workdir test_failure } |