Skip to content

Commit a065118

Browse files
authored
Release 0.1.14 (#49)
* 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
1 parent ea67a59 commit a065118

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Release 0.1.14 (2021-04-02)
2+
=====
3+
4+
* Remember user's GitHub credentials for 1 day (for pushing)
5+
* When `git push`ing, Git will no longer bother you about your local branch's name not matching the remote's
6+
* You need to re-set up fork management for these two improvements
7+
* Fix issue where it would lock user out from `ssh` if a `/openpilot` directory doesn't exist
8+
* 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)
9+
10+
111
Release 0.1.13 (2021-02-22)
212
=====
313

commands/fork/__init__.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,18 @@ def _init(self):
426426
if not r.success:
427427
error(r.output)
428428
return
429+
429430
# rename release2 to commaai_release2 to align with emu fork standards
430-
check_output(['git', '-C', OPENPILOT_PATH, 'branch', '-m', f'{self.comma_origin_name}_{self.comma_default_branch}'])
431+
r = check_output(['git', '-C', OPENPILOT_PATH, 'branch', '-m', f'{self.comma_origin_name}_{self.comma_default_branch}'])
432+
if not r.success:
433+
error(r.output)
434+
return
435+
436+
# set git config push.default to `upstream` to remove differently named remote branch warning when pushing
437+
check_output(['git', '-C', OPENPILOT_PATH, 'config', 'push.default', 'upstream']) # not game breaking if this fails
438+
439+
# remember username and password of user for pushing
440+
check_output(['git', '-C', OPENPILOT_PATH, 'config', 'credential.helper', 'cache --timeout=1440']) # cache for a day
431441

432442
success('Fork management set up successfully! You\'re on {}/{}'.format(self.comma_origin_name, self.comma_default_branch))
433443
success('To get started, try running: {}emu fork switch (username) [-b BRANCH]{}'.format(COLORS.RED, COLORS.ENDC))

install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ COMMUNITY_BASHRC_PATH=/data/community/.bashrc
2626
OH_MY_COMMA_PATH=/data/community/.oh-my-comma
2727
GIT_BRANCH_NAME=master
2828
GIT_REMOTE_URL=https://github.com/emu-sh/.oh-my-comma.git
29-
OMC_VERSION=0.1.13
29+
OMC_VERSION=0.1.14
3030

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

0 commit comments

Comments
 (0)