[kibble-scanners] branch master updated: override alerts should cause a rewind attempt as well

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kibble-scanners.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e53ef3  override alerts should cause a rewind attempt as well
9e53ef3 is described below

commit 9e53ef31472dac1776b84ccc76441b8087613002
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Nov 27 16:05:40 2017 +0100

    override alerts should cause a rewind attempt as well
    
    When git says 'Your local changes to the following files would be
    overwritten by checkout' we should probably try a rewind as well.
---
 src/plugins/scanners/git-sync.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/scanners/git-sync.py b/src/plugins/scanners/git-sync.py
index fcfe136..c497e52 100644
--- a/src/plugins/scanners/git-sync.py
+++ b/src/plugins/scanners/git-sync.py
@@ -101,7 +101,7 @@ def scan(KibbletBit, source):
                 except subprocess.CalledProcessError as err:
                     e = str(err.output).lower()
                     # We're interested in merge conflicts, which we can resolve through trickery.
-                    if n > 0 or not ('resolve' in e or 'merge' in e):
+                    if n > 0 or not ('resolve' in e or 'merge' in e or 'overwritten' in e):
                         # This isn't a merge conflict, pass it to outer func
                         raise err
                     else:

-- 
To stop receiving notification emails like this one, please contact
['"commits@kibble.apache.org" <co...@kibble.apache.org>'].