diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 12:24:51 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 12:24:51 +0100 |
commit | cd7d350f25a111bec0843ff4cb60507ee92e4677 (patch) | |
tree | 44c01cdbf7944325ca0dbac57c4f64e2fd7748fe /git-debrebase | |
parent | 7733ad1abc82a79f835c02f89d18c743dd107d91 (diff) |
git-debrebase: keycommits: New $claimed_bw optional argument
No users yet, so NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index e068f35..8ddf18d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -810,8 +810,8 @@ sub classify ($) { return $classify->("VanillaMerge"); } -sub keycommits ($;$$$$) { - my ($head, $furniture, $unclean, $trouble, $fatal) = @_; +sub keycommits ($;$$$$$) { + my ($head, $furniture, $unclean, $trouble, $fatal, $claimed_bw) = @_; # => ($anchor, $breakwater) # $unclean->("unclean-$tagsfx", $msg, $cl) @@ -827,6 +827,8 @@ sub keycommits ($;$$$$) { # $fatal is for unprocessable commits, and should normally cause # a failure. If ignored, agaion, (undef, undef) is returned. # + # If $claimed_bw, this is supposed to be a breakwater commit. + # # If a callback is undef, fail is called instead. # If a callback is defined but false, the situation is ignored. # Callbacks may say: @@ -834,6 +836,7 @@ sub keycommits ($;$$$$) { # if the answer is no longer wanted. my ($anchor, $breakwater); + $breakwater = $head if $claimed_bw; my $clogonly; my $cl; my $found_pm; |