From: Karl Hasselström <kha@treskal.com>
Date: Thu, 20 Mar 2008 23:12:11 +0000 (+0000)
Subject: Handle failed pushes differently depending on cause
X-Git-Tag: v0.15-rc1~264
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/363d432f16ef2ba8b8f11e6b2402c35842a0a7e7?hp=363d432f16ef2ba8b8f11e6b2402c35842a0a7e7

Handle failed pushes differently depending on cause

Specifically, if the push failed because of a merge conflict, the
patch should be applied but empty; and if it fails for any other
reason (such as a too-dirty worktree), the patch should not be
applied.

This fixes the data loss bug tested for by t3000.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---