summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/git-backup-on-error.script4
-rw-r--r--tests/git-backup-on-error.stdout3
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error.script
index 866db65..cbaa247 100755
--- a/tests/git-backup-on-error.script
+++ b/tests/git-backup-on-error.script
@@ -34,13 +34,13 @@ normalize() {
}
# mirror some history
-./lorry --pull-only --log="$logfile" --working-area="$workdir" \
+./lorry --pull-only --log="$logfile" --working-area="$workdir" --bundle=never \
"$DATADIR/git-backup-test-repo.lorry" | normalize
# make upstream disappear to cause errors
rm -rf "$repo"
if ./lorry --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/git-backup-test-repo.lorry" | normalize
+ "$DATADIR/git-backup-test-repo.lorry" --bundle=never | normalize
then
echo Previous lorry command should have failed >&2
exit 1
diff --git a/tests/git-backup-on-error.stdout b/tests/git-backup-on-error.stdout
index c68ad21..bdee3e0 100644
--- a/tests/git-backup-on-error.stdout
+++ b/tests/git-backup-on-error.stdout
@@ -11,7 +11,6 @@ DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/HEAD
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/branches
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/config
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/description
-DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks/applypatch-msg.sample
DATADIR/work-dir/git-backup-test-repo/git-post-fail-DATETIME/hooks/commit-msg.sample
@@ -36,7 +35,6 @@ DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/HEAD
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/branches
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/config
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/description
-DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks/applypatch-msg.sample
DATADIR/work-dir/git-backup-test-repo/git-pre-update-DATETIME/hooks/commit-msg.sample
@@ -60,7 +58,6 @@ DATADIR/work-dir/git-backup-test-repo/git/HEAD
DATADIR/work-dir/git-backup-test-repo/git/branches
DATADIR/work-dir/git-backup-test-repo/git/config
DATADIR/work-dir/git-backup-test-repo/git/description
-DATADIR/work-dir/git-backup-test-repo/git/git___gitorious_org_baserock_morphs_git_backup_test_repo.bndl
DATADIR/work-dir/git-backup-test-repo/git/hooks
DATADIR/work-dir/git-backup-test-repo/git/hooks/applypatch-msg.sample
DATADIR/work-dir/git-backup-test-repo/git/hooks/commit-msg.sample