Wookey writes ("Bug#977426: git-debrebase: complains about undocumented snag:
-fanchor-treated"):
> $ git debrebase new-upstream 20.05
> git-debrebase: snag detected (-fanchor-treated): old anchor is recognised due
> to --anchor, cannot check upstream
>
> I don't understand what it is complaining about and whilst -fanchor is
> described in man 1 git-debrebase -fanchor-treated is not. So
> documenting this would be good. If you explain it to me I could try
> and document it myself and supply a patch.
Hi. Sorry we didn't reply at the time...
The manpage has this to say about --anchor:
--anchor=<commit-ish>
Treats <commit-ish> as an anchor. This overrides the usual
logic which automatically classifies commits as anchors,
pseudomerges, delta queue commits, etc.
It also disables some coherency checks which depend on
metadata extracted from its commit message, so it is a snag
if <commit-ish> is the anchor for the previous upstream
version in git-debrebase new- upstream operations.
The snag mentioned in that 2nd paragraph is precisely
-fanchor-treated.
You say "-fanchor is described in man 1 git-debrebase". I think that
was a slip and you meant to say that "--anchor is described...".
Since none of the snags are otherwise documented.
I agree that that wording is not helpful. It ought to say what you
need to check for yourself. Otherwise how are you to know whether
it's right to -f it ?
> Adding -fanchor-treated makes the rebase proceed as expected, but I'd
> like to understand why that is needed rather than blindly adding it.
Quite so.
I will do this:
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 639b07d2e..17e750a98 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -532,9 +532,12 @@ commits as anchors, pseudomerges, delta queue commits,
etc.
It also disables some coherency checks
which depend on metadata extracted from its commit message,
so
-it is a snag if <commit-ish> is the anchor
+it is a snag (C<-fanchor-treated>) if <commit-ish> is the anchor
for the previous upstream version in
git-debrebase new-upstream operations.
+You have to check yourself that the new upstream
+is fast forward from the old one,
+and has the right components (as if applicable).
=item --dgit=<program>
I'm hoping to upload RSN, so will close this bug then. Feel free to
suggest better wording (in a new bug, if applicable).
Thanks,
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
