]> git.e2factory.org Git - e2factory.git/commitdiff
Whoops, the -f in git checkout was missing
authorTobias Ulmer <tu@emlix.com>
Thu, 6 Feb 2014 19:09:24 +0000 (20:09 +0100)
committerTobias Ulmer <tu@emlix.com>
Wed, 16 Nov 2016 14:41:17 +0000 (15:41 +0100)
Works so much better now...

Signed-off-by: Tobias Ulmer <tu@emlix.com>
plugins/git.lua

index c1587eaea1559c529706105f58b4f8a41bdffe06..3b604cf9fbaafc79c5cfb3737b38aa00a98c6046 100644 (file)
@@ -341,7 +341,7 @@ function git.prepare_source(info, sourcename, sourceset, buildpath)
             return e:cat(re)
         end
 
-        argv = generic_git.git_new_argv(gitdir, work_tree, "checkout")
+        argv = generic_git.git_new_argv(gitdir, work_tree, "checkout", "-f")
         table.insert(argv, "refs/heads/" .. src.branch)
         table.insert(argv, "--")
 
@@ -364,7 +364,7 @@ function git.prepare_source(info, sourcename, sourceset, buildpath)
             return false, e:cat(re)
         end
 
-        argv = generic_git.git_new_argv(gitdir, work_tree, "checkout")
+        argv = generic_git.git_new_argv(gitdir, work_tree, "checkout", "-f")
         table.insert(argv, "refs/tags/" .. src.tag)
         table.insert(argv, "--")