From: Elijah Newren <newren@gmail.com>
Date: Sun, 3 Oct 2010 20:00:09 +0000 (-0600)
Subject: t6016 (rev-list-graph-simplify-history): add missing &&
X-Git-Tag: v1.7.4-rc0~65^2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6f68a2e746405c1aa72f12a030de1485dff3dab?ds=inline;hp=e6f68a2e746405c1aa72f12a030de1485dff3dab

t6016 (rev-list-graph-simplify-history): add missing &&

Also move repeated tag and branch deletions into a separate setup test, to
avoid failures from tags and branches having already been deleted.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---