Commit 7759dae6 authored by Lorenzo Martinico's avatar Lorenzo Martinico Committed by Thomas Gambier

Update points to origin/nexedi

parent 7989de73
...@@ -108,6 +108,7 @@ rescue Docopt::Exit => e ...@@ -108,6 +108,7 @@ rescue Docopt::Exit => e
exit 1 exit 1
end end
@origin_branch = "nexedi"
String.use_color = args["--color"] || !args["--no-color"] String.use_color = args["--color"] || !args["--no-color"]
@opt_keep = args["--keep"] @opt_keep = args["--keep"]
@opt_verbose = args["--verbose"] @opt_verbose = args["--verbose"]
...@@ -517,8 +518,8 @@ def update ...@@ -517,8 +518,8 @@ def update
system "git fetch testing #{@crew_testing_branch}" system "git fetch testing #{@crew_testing_branch}"
system "git reset --hard testing/#{@crew_testing_branch}" system "git reset --hard testing/#{@crew_testing_branch}"
else else
system 'git fetch origin master' system 'git fetch origin ' + @origin_branch
system 'git reset --hard origin/master' system 'git reset --hard origin/' + @origin_branch
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment