From 2250673c9e458438ae3df6c98bbf0423e81891d3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 12:22:54 +0100 Subject: [PATCH] git-debrebase: keycommits: Break out $found_anchor We are going to want to reuse this. Signed-off-by: Ian Jackson --- git-debrebase | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/git-debrebase b/git-debrebase index 3d8d6f33..06cdc769 100755 --- a/git-debrebase +++ b/git-debrebase @@ -846,6 +846,13 @@ sub keycommits ($;$$$$) { return unless $cb; $cb->("unclean-$tagsfx", $why, $cl, $mainwhy); }; + my $found_anchor = sub { + ($anchor) = @_; + $breakwater //= $clogonly; + $breakwater //= $head; + no warnings qw(exiting); + last; + }; for (;;) { $cl = classify $head; my $ty = $cl->{Type}; @@ -859,10 +866,7 @@ sub keycommits ($;$$$$) { } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor' or $ty eq 'BreakwaterStart') { - $anchor = $head; - $breakwater //= $clogonly; - $breakwater //= $head; - last; + $found_anchor->($head); } elsif ($ty eq 'Upstream') { $x->($unclean, 'ordering', "packaging change ($breakwater) follows upstream change"," (eg $head)") -- 2.30.2