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>
Sun, 18 Feb 2018 12:04:44 +0000 (12:04 +0000)
commit0f78ffeb7a8a64edc50852ccca19436dba6572b6
tree9b4021d1254bdb13d34892d855f2ff782335cc20
parent84df7d90264eaccfbfbf9728994fcd54eae4b3d2
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