From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jun 2018 15:47:34 +0000 (+0100)
Subject: git-debrebase: keycommits: Pass $cl to callbacks
X-Git-Tag: archive/debian/5.0~39
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=bfbcc503e9a18643f664f74940ab9d8ed65ddb30

git-debrebase: keycommits: Pass $cl to callbacks

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index cb0276be..c0600126 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;