liquid_feedback_frontend

changeset 1221:e80c8790a1ca

Use -f switch for git-checkout in lf4rcs example config
author jbe
date Tue Dec 01 02:10:40 2015 +0100 (2015-12-01)
parents af42478acf74
children a38df55525d6
files config/example.lua
line diff
     1.1 --- a/config/example.lua	Tue Dec 01 02:10:04 2015 +0100
     1.2 +++ b/config/example.lua	Tue Dec 01 02:10:40 2015 +0100
     1.3 @@ -290,8 +290,7 @@
     1.4    
     1.5    commit = function(path, exec, branch, target_node_id, close_message, merge_message)
     1.6      if merge_message then
     1.7 -      -- TODO reset on error
     1.8 -      exec("git", "-C", path, "checkout", "master")
     1.9 +      exec("git", "-C", path, "checkout", "-f", "master")
    1.10        exec("git", "-C", path, "merge", target_node_id, "-m", merge_message)
    1.11        exec("git", "-C", path, "push", "origin", "master")
    1.12      end

Impressum / About Us