chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 365c05e) | patch
Split brain: Fix unapplied tree handling
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 10 Jul 2016 18:46:40 +0000 (19:46 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:48 +0000 (16:47 +0100)
commit048c26164775aaf523086e60b4a975279341c3e2
treee7fba7b950aac303d1e793cf569deb3bbf094c36tree | snapshot
parent365c05e1ecc2bdf4dcf96d7c726f68aaf40888f2commit | diff
Split brain: Fix unapplied tree handling

Do the quiltify_splitbrain_needed if there _are_ patches, not if there
aren't.  And if we're told it was an unapplied tree, check that HEAD
and orig are indeed the same (excluding debian/*, of course) and print
a useful message if not.
dgit diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.