Control: severity -1 minor
Ruben Undheim writes ("Bug#906908: dgit: Fails to push-source for gbp repo.
dgit thinks it is git-debrebase repo"):
> myshell> dgit --gbp push-source
...
> git-debrebase: error: found unprocessable commit, cannot cope: edits
> debian/patches (e48f7af70b5c3738b35d926ecdb16dd925571db5)
> git-debrebase: Branch/history seems mangled - no longer in gdr format.
> git-debrebase: See ILLEGAL OPERATIONS in git-debrebase(5).
> git-debrebase: Consider git-debrebase scrap, to throw away your recent work.
> dgit: failed command: git-debrebase stitch
I have looked at the code and the call to git-debrebase stitch (l.4238
of ./dgit) is conditional on branch_is_gdr_unstitched_ff, which checks
for the ffq-prev ref corresponding to your current branch.
I conjecture that you did this:
$ git debrebase convert-from-gbp
# play around a bit leaving an unstitched branch
$ git reset --hard salsa/master
# maybe some gbp style work
$ dgit push-source
?
If so, please:
$ git branch temp
$ git debrebase scrap
$ git reset --hard temp
to get rid of the ffq-prev ref.
I think I will improve the error message for this case, since it
doesn't make any kind of sense to pass --gbp when there is the
ffq-prev ref present.
Maybe also there should be something in the docs, or maybe in our
promotional materials (talks, emails, whatever) to say that after
trying out git-debrebase, one should git-debrebase scrap, and that
git-reset --hard is not sufficient.
Anyway, thanks for the report.
I would still like the output of
git show-ref
git branch
to confirm my conjecture about what the program was doing.
Regards,
Ian.
