diff options
-rwxr-xr-x | git-debrebase | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-debrebase b/git-debrebase index cb0276b..c060012 100755 --- a/git-debrebase +++ b/git-debrebase @@ -238,8 +238,8 @@ sub make_commit ($$) { } our @snag_force_opts; -sub snag ($$) { - my ($tag,$msg) = @_; +sub snag ($$;@) { + my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits if (grep { $_ eq $tag } @snag_force_opts) { $snags_forced++; print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n"; @@ -542,9 +542,9 @@ sub keycommits ($;$$$) { my ($head, $furniture, $unclean, $trouble) = @_; # => ($anchor, $breakwater) - # $unclean->("unclean-$tagsfx", $msg) - # $furniture->("unclean-$tagsfx", $msg) - # $dgitimport->("unclean-$tagsfx", $msg) + # $unclean->("unclean-$tagsfx", $msg, $cl) + # $furniture->("unclean-$tagsfx", $msg, $cl) + # $dgitimport->("unclean-$tagsfx", $msg, $cl)) # is callled for each situation or commit that # wouldn't be found in a laundered branch # $furniture is for furniture commits such as might be found on an @@ -567,7 +567,7 @@ sub keycommits ($;$$$) { my $m = "branch needs laundering (run git-debrebase): $why"; fail $m unless defined $cb; return unless $cb; - $cb->("unclean-$tagsfx", $why); + $cb->("unclean-$tagsfx", $why, $cl); }; for (;;) { $cl = classify $head; |