chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 363d432)
Handle failed pushes differently depending on cause
authorKarl Hasselström <kha@treskal.com>
Thu, 20 Mar 2008 23:12:11 +0000 (23:12 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 20 Mar 2008 23:12:11 +0000 (23:12 +0000)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)