summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-02 11:33:26 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-02 11:35:35 +0100
commiteedaadbe6baffb2217fc91c6a97bd2d5d71f9da0 (patch)
treec94e14e4e116e2305cfd781c499ab23cf44a69cb /tests
parent5beda194296368b661294809786b68221d521e63 (diff)
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
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tartree-edit6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/tartree-edit b/tests/tartree-edit
index cecc142..cdaade3 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