summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/git-backup-on-error-multiple-backups.script (renamed from tests/git-backup-on-error.script)4
-rwxr-xr-xtests/git-backup-on-error-multiple-backups.setup (renamed from tests/git-backup-on-error.setup)0
-rw-r--r--tests/git-backup-on-error-multiple-backups.stderr (renamed from tests/git-backup-on-error.stderr)0
-rw-r--r--tests/git-backup-on-error-multiple-backups.stdout (renamed from tests/git-backup-on-error.stdout)0
4 files changed, 2 insertions, 2 deletions
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error-multiple-backups.script
index 544a392..8bda5ad 100755
--- a/tests/git-backup-on-error.script
+++ b/tests/git-backup-on-error-multiple-backups.script
@@ -42,8 +42,8 @@ normalize() {
# make upstream disappear to cause errors
rm -rf "$repo"
if "${SRCDIR}/test-lorry" --pull-only --log="$logfile" --working-area="$workdir" \
- "$DATADIR/git-backup-test-repo.lorry" --bundle=never 2>/dev/null | \
- normalize
+ "$DATADIR/git-backup-test-repo.lorry" --bundle=never 2>/dev/null \
+ --keep-multiple-backups | normalize
then
echo Previous lorry command should have failed >&2
exit 1
diff --git a/tests/git-backup-on-error.setup b/tests/git-backup-on-error-multiple-backups.setup
index 03a8dad..03a8dad 100755
--- a/tests/git-backup-on-error.setup
+++ b/tests/git-backup-on-error-multiple-backups.setup
diff --git a/tests/git-backup-on-error.stderr b/tests/git-backup-on-error-multiple-backups.stderr
index e69de29..e69de29 100644
--- a/tests/git-backup-on-error.stderr
+++ b/tests/git-backup-on-error-multiple-backups.stderr
diff --git a/tests/git-backup-on-error.stdout b/tests/git-backup-on-error-multiple-backups.stdout
index d918599..d918599 100644
--- a/tests/git-backup-on-error.stdout
+++ b/tests/git-backup-on-error-multiple-backups.stdout