- foreach my $file ($files) {
- my $cfgname = "merge.topbloke-$file.";
- my $current = run_git_1line(qw(config), "$cfgname.driver");
- next if $current =~ m/^topbloke-merge-driver --v$version /o;
- debug("setting merge driver $file");
- run_git_1line(qw(config), "$cfgname.name",
- "topbloke merge driver for $file");
- run_git_1line(qw(config), "$cfgname.driver",
- "topbloke-merge-driver --v$version $file %O %A %B %L");
+ foreach my $iteration (qw(0 1)) {
+ foreach my $file (@files) {
+ my $cfgname = "merge.topbloke-$file";
+ my ($current_estatus, $current) =
+ run_git_1line_estatus(qw(config), "$cfgname.driver");
+ $current = "## failed $current_estatus" if $current_estatus;
+ next if $current =~ m/^topbloke-merge-driver --v$version /o;
+ die "$file $current ?" if $iteration;
+ debug("setting merge driver $file");
+ run_git_nooutput(qw(config), "$cfgname.name",
+ "topbloke merge driver for $file");
+ run_git_nooutput(qw(config), "$cfgname.driver",
+ "topbloke-merge-driver --v$version".
+ " $file %O %A %B %L");
+ }
+ my ($newattrs, $attrsfile);
+ foreach my $file (@files) {
+ my $path = ".topbloke/$file";
+ my $current = run_git_1line(qw(check-attr merge), $path);
+ $current =~ s#^\Q$path\E: merge: ## or die "$file $current ?";
+ my $want = "topbloke-$file";
+ next if $current eq $want;
+ die "$file $current ?" unless $current eq 'unspecified';
+ die "$file $current ?" if $iteration;
+ if (!$newattrs) {
+ $attrsfile = git_dir()."/info/attributes";
+ $newattrs = new IO::File "$attrsfile.tmp", 'w'
+ or die "$attrsfile.tmp: $!";
+ if (!open OA, '<', "$attrsfile") {
+ die "$attrsfile $!" unless $!==&ENOENT;
+ } else {
+ while (<OA>) {
+ print $newattrs $_ or die $!;
+ print "\n" or die $! unless chomp;
+ }
+ die $! if OA->error;
+ die $! unless close OA;
+ }
+ }
+ print $newattrs "$path\tmerge=$want\n" or die $!;
+ }
+ last if !$newattrs;
+ close $newattrs or die $!;
+ rename "$attrsfile.tmp", "$attrsfile" or die $!;
+ }
+}
+
+sub check_no_unwanted_metadata ($) {
+ my ($gitbranch) = @_;
+ open GIT, "-|", 'git', qw(ls-tree --name-status),
+ "$gitbranch:", qw(.topbloke/included .topbloke/flags)
+ or die $!;
+ while (<GIT>) {
+ chomp or die;
+ die "foreign unexpectedly contains $_\n";