summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:42:16 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-24 17:42:16 +0100
commit6cbd43fd64d1ab98a3884dc416342962c74e2544 (patch)
treefdea8f4f8570a17da5ee112eae46dd3cd74976fb /tests
parent1aa5c24c3661c2064b626419ded16ac38e66cf32 (diff)
downloadlorry-6cbd43fd64d1ab98a3884dc416342962c74e2544.tar.gz
lorry: force fetch from upstream
As annoying as it is to have non-fast-forward commits, it is still a valid workflow, so it has to be allowed.
Diffstat (limited to 'tests')
-rw-r--r--tests/git-backup-on-error.stdout2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/git-backup-on-error.stdout b/tests/git-backup-on-error.stdout
index ad4ae11..c68ad21 100644
--- a/tests/git-backup-on-error.stdout
+++ b/tests/git-backup-on-error.stdout
@@ -1,5 +1,5 @@
Mirror of git-backup-test-repo failed, state before mirror is saved at DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME and state after mirror is saved at DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME
-Exception: git fetch file://DATADIR/git-backup-test-repo refs/heads/*:refs/heads/* refs/tags/*:refs/tags/* failed (exit code 128):
+Exception: git fetch file://DATADIR/git-backup-test-repo +refs/heads/*:refs/heads/* +refs/tags/*:refs/tags/* failed (exit code 128):
fatal: 'DATADIR/git-backup-test-repo' does not appear to be a git repository
fatal: The remote end hung up unexpectedly