Skip to content

Commit

Permalink
Fix issue where bootstrap incorrectly determines git branch if starti…
Browse files Browse the repository at this point in the history
…ng bootstrap outside Spyder repo.
  • Loading branch information
mrclary committed Jun 29, 2023
1 parent 63f448f commit a13aa9f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
prev_branch = boot_branch_file.read_text()

result = subprocess.run(
["git", "merge-base", "--fork-point", "master"],
["git", "-C", DEVPATH, "merge-base", "--fork-point", "master"],
capture_output=True
)
branch = "master" if result.stdout else "not master"
Expand Down

0 comments on commit a13aa9f

Please sign in to comment.