summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-31 19:02:32 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-05 13:41:48 +0100
commit5a25026a936fed50c4ad1dd06b5fc57f3fe9c2c0 (patch)
tree8c9c1ee335a970f893cec9ca8d9cd8b1ae9e07af /dgit
parent626570adb7708d465460d236c9da1b82a23c22b4 (diff)
Split brain: TODOs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 0 insertions, 2 deletions
diff --git a/dgit b/dgit
index 288fc78..53ccd72 100755
--- a/dgit
+++ b/dgit
@@ -2148,8 +2148,6 @@ END
}
}
- die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
-
check_not_dirty();
changedir $ud;
progress "checking that $dscfn corresponds to HEAD";