summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2023-02-04 16:15:40 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2023-02-04 16:15:40 +0000
commitb172279e243c81b3741ffa66651b2557de750e37 (patch)
tree9266ebc806991e8767d3725f32b6154126916b69
parent8812d1bba97bb030d661cc3db1a3e11c3b847914 (diff)
git-debrebase: Break out treated_anchor_msg
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index c690172..927a391 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1154,6 +1154,10 @@ sub keycommits ($;$$$$$) {
return ($anchor, $breakwater);
}
+sub treated_anchor_msg () {
+ __ 'old anchor is recognised due to --anchor, cannot check upstream'
+}
+
sub walk ($;$$$);
sub walk ($;$$$) {
my ($input,
@@ -2033,8 +2037,7 @@ sub cmd_new_upstream () {
my $old_anchor_cl = classify $old_anchor;
my $old_upstream;
if (!$old_anchor_cl->{OrigParents}) {
- snag 'anchor-treated',
- __ 'old anchor is recognised due to --anchor, cannot check upstream';
+ snag 'anchor-treated', treated_anchor_msg();
} else {
$old_upstream = parsecommit
$old_anchor_cl->{OrigParents}[0]{CommitId};