Skip to content

Commit

Permalink
acme_cime_merge fixes
Browse files Browse the repository at this point in the history
The branch made that contains the CIME update should not track origin/master.

The library should not be executable.

[BFB]
  • Loading branch information
jgfouca committed Nov 28, 2017
1 parent 0d32c66 commit d2aa465
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/lib/acme_cime_mgmt.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def do_subtree_pull():
def make_pr_branch(branch, branch_head):
###############################################################################
pr_branch = "{}-pr".format(branch)
run_cmd_no_fail("git checkout -b {} {}".format(pr_branch, branch_head))
run_cmd_no_fail("git checkout --no-track -b {} {}".format(pr_branch, branch_head))

return pr_branch

Expand Down

0 comments on commit d2aa465

Please sign in to comment.