wip gitattrs dealt with

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index d55cdeb5326f40b9c9a199c73c49721f842e9caa..56dab889aac8cd82533f9fe330b39b68c72cee30 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -340,7 +340,13 @@ sub launder ($$$) {
            next;
        } elsif ($ty eq 'Pseudomerge') {
            if (defined $pseudos_must_overwrite_this) {
-               confess 'xxx actually check this';
+               grep {
+                   is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
+               },
+                   @{ $cl->{Overwritten} }
+               or
+                   die "Pseudomerge $cl->{CommitId} does not overwrite ".
+                       "$pseudos_must_overwrite_this as expected.";
            }
            push @pseudomerges, $cl;
            $rewrite_from_here->();
@@ -384,7 +390,6 @@ sub launder ($$$) {
     # Now we build it back up again
 
     workarea_fresh();
-    in_workarea sub { xxx attributes xxx };
 
     my $rewriting = 1;