summaryrefslogtreecommitdiff
path: root/tests/git-backup-on-error.script
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-08-31 15:53:52 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-08-31 15:53:52 +0100
commit8ebddf0a3234eebceadc6a4edef94b566625cfd3 (patch)
treeb0e47a7213abcdc6e59234f5b3e689a37088e98f /tests/git-backup-on-error.script
parent77a24e14c8e24654e72e8b840aeda15238033c5c (diff)
parent9c1609b241c48748dad26cf14dcad2374e392b55 (diff)
downloadlorry-8ebddf0a3234eebceadc6a4edef94b566625cfd3.tar.gz
Merge branch 'liw/names-with-slashes'
Reviewed-By: Daniel Silverstone on irc
Diffstat (limited to 'tests/git-backup-on-error.script')
-rwxr-xr-xtests/git-backup-on-error.script3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/git-backup-on-error.script b/tests/git-backup-on-error.script
index cbaa247..134367c 100755
--- a/tests/git-backup-on-error.script
+++ b/tests/git-backup-on-error.script
@@ -40,7 +40,8 @@ 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" --bundle=never | normalize
+ "$DATADIR/git-backup-test-repo.lorry" --bundle=never 2>/dev/null | \
+ normalize
then
echo Previous lorry command should have failed >&2
exit 1