Skip to content

Commit

Permalink
Release 0.1.14 (#49)
Browse files Browse the repository at this point in the history
* Debug

* Set push.default to upstream to allow git push without hassle

* Remember username/password

* debug

* no quotes needed?

* no quotes are needed!

* cache for a day

* Update changelog
  • Loading branch information
sshane authored Apr 2, 2021
1 parent ea67a59 commit a065118
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Release 0.1.14 (2021-04-02)
=====

* Remember user's GitHub credentials for 1 day (for pushing)
* When `git push`ing, Git will no longer bother you about your local branch's name not matching the remote's
* You need to re-set up fork management for these two improvements
* Fix issue where it would lock user out from `ssh` if a `/openpilot` directory doesn't exist
* You need to apply the changes manually in your `/data/community/.bashrc` file from [this commit](https://github.com/emu-sh/.oh-my-comma/commit/ea67a5960cf3e4aeb93627060ca4ed990a71f595)


Release 0.1.13 (2021-02-22)
=====

Expand Down
12 changes: 11 additions & 1 deletion commands/fork/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,18 @@ def _init(self):
if not r.success:
error(r.output)
return

# rename release2 to commaai_release2 to align with emu fork standards
check_output(['git', '-C', OPENPILOT_PATH, 'branch', '-m', f'{self.comma_origin_name}_{self.comma_default_branch}'])
r = check_output(['git', '-C', OPENPILOT_PATH, 'branch', '-m', f'{self.comma_origin_name}_{self.comma_default_branch}'])
if not r.success:
error(r.output)
return

# set git config push.default to `upstream` to remove differently named remote branch warning when pushing
check_output(['git', '-C', OPENPILOT_PATH, 'config', 'push.default', 'upstream']) # not game breaking if this fails

# remember username and password of user for pushing
check_output(['git', '-C', OPENPILOT_PATH, 'config', 'credential.helper', 'cache --timeout=1440']) # cache for a day

success('Fork management set up successfully! You\'re on {}/{}'.format(self.comma_origin_name, self.comma_default_branch))
success('To get started, try running: {}emu fork switch (username) [-b BRANCH]{}'.format(COLORS.RED, COLORS.ENDC))
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COMMUNITY_BASHRC_PATH=/data/community/.bashrc
OH_MY_COMMA_PATH=/data/community/.oh-my-comma
GIT_BRANCH_NAME=master
GIT_REMOTE_URL=https://github.com/emu-sh/.oh-my-comma.git
OMC_VERSION=0.1.13
OMC_VERSION=0.1.14

install_echo() { # only prints if not updating
if [ "$update" != true ]; then
Expand Down

0 comments on commit a065118

Please sign in to comment.