a6c9bd0eb5
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> http://bugs.koha-community.org/show_bug.cgi?id=9987 Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
58 lines
1.7 KiB
Perl
58 lines
1.7 KiB
Perl
# Copyright 2010 Galen Charlton
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use Test::More;
|
|
use File::Spec;
|
|
use File::Find;
|
|
use IO::File;
|
|
|
|
find({
|
|
bydepth => 1,
|
|
no_chdir => 1,
|
|
wanted => sub {
|
|
my $file = $_;
|
|
|
|
return if $file =~ /\.(ico|jpg|gif|ogg|pdf|png|psd|swf|zip|.*\~)$/;
|
|
return unless -f $file;
|
|
|
|
my @name_parts = File::Spec->splitpath($file);
|
|
my %dirs = map { $_ => 1 } File::Spec->splitdir($name_parts[1]);
|
|
return if exists $dirs{'.git'};
|
|
|
|
my $fh = IO::File->new($file, 'r');
|
|
my $marker_found = 0;
|
|
my $line = 0;
|
|
while (<$fh>) {
|
|
$line++;
|
|
if (/^<<<<<</ or /^>>>>>>/) {
|
|
# could check for ^=====, but that's often used in text files
|
|
$marker_found = 1;
|
|
last;
|
|
}
|
|
}
|
|
close $fh;
|
|
if ($marker_found) {
|
|
fail("$file contains merge conflict markers in line $line");
|
|
} else {
|
|
pass("$file has no merge conflict markers");
|
|
}
|
|
},
|
|
}, File::Spec->curdir());
|
|
done_testing();
|