From eedaadbe6baffb2217fc91c6a97bd2d5d71f9da0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Jul 2016 11:33:26 +0100
Subject: [PATCH] Test suite: tartree-edit: gitfetchinfo: Be a bit more careful

* Turn on perl warnings
* Use strict
* When removing old merged refs, insist that we aren't handling A+A
---
 tests/tartree-edit | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/tartree-edit b/tests/tartree-edit
index cecc142c..cdaade35 100755
--- a/tests/tartree-edit
+++ b/tests/tartree-edit
@@ -128,7 +128,8 @@ tryat_gitfetchinfo () {
 	local innerwd="$(echo $play/*)"
 
 	git for-each-ref --format='%(refname)' refs/remotes >$play/l
-	perl -ne '
+	perl -w -ne '
+	    use strict;
 	    chomp;
 	    next unless m#^refs/remotes/([^/]+)/#;
 	    my $old = $_;
@@ -136,7 +137,8 @@ tryat_gitfetchinfo () {
 	    my $rhs = $'\'';
 	    my @ab = split /\+/, $ab;
 	    next unless @ab == 2;
-	    next unless grep { $_ eq "'"$remote"'" } @ab;
+	    next unless (grep { $_ eq "'"$remote"'" } @ab) == 1;
+	    $remerge{"@ab"} = 1;
 	    print "update refs/remotes/$_/$rhs $old\n" or die $! foreach @ab;
 	    print "delete $old\n" or die $!;
 	' <$play/l >$play/unmerge
-- 
2.30.2