chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d90ef8) | patch
Split brain: some work on integration into the rest of dgit
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 28 Nov 2015 17:43:33 +0000 (17:43 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000 (16:47 +0100)
commit57b7ccba1b4e833e9ffc91efe0afe550138f530d
treed5f473939bb5faf6dc18071bf1b4a534b0fa660ftree | snapshot
parent1d90ef8b49ccf6156953d7595d33680276a8e8c7commit | diff
Split brain: some work on integration into the rest of dgit

* Move the fast forward die to where we will need to make the
  synthetic commit, so that the tree equality check is done on the
  thing we will actually push.

* Crash if we are trying to do split brain without split build.
  (This should never happen.)

* Set split build if we need split brain.
dgit diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.