chiark / gitweb /
git-debrebase: DgitImportUnpatched: defer upstream diff check
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 20:24:56 +0000 (20:24 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:11 +0000 (16:03 +0100)
commitda894f5bc73ad2a5cbf6d74533818ca359f141b0
tree157ce9106c25c16d48ba2f09f8e0978e63ad840b
parentcd2fb073d878511939ff074c19729acf6d598365
git-debrebase: DgitImportUnpatched: defer upstream diff check

We can't do this during the initial walk, because what we ought to be
comparing is the previous breakwater with the new one.  So we have to
wait until the walk has proceeded down the overwritten branch, to find
the old breakwater.

This can be done by waiting until we are rebuilding the branch: at
that point, we have just built the previous breakwater, so we can
compare it to the dgit unpatched import.

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