This repository was archived by the owner on Apr 16, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ if [[ ! -d "$SCRIPT_DIR"/doom-nvim-contrib ]]; then
49
49
if git show-ref --quiet refs/heads/" $BRANCH_NAME " ; then
50
50
git worktree add ./doom-nvim-contrib " $BRANCH_NAME "
51
51
else
52
- git worktree add ./doom-nvim-contrib origin/develop -b " $BRANCH_NAME "
52
+ git worktree add ./doom-nvim-contrib origin/main -b " $BRANCH_NAME "
53
53
fi
54
54
fi
55
55
71
71
git checkout -b " $BRANCH_NAME " main
72
72
git fetch --quiet
73
73
# If changes between local and origin, get latest changes
74
- if [[ ! $( git rev-list develop ...origin/develop --count ) -eq 0 ]]; then
75
- echo " - WARN: There are upstream changes to develop branch. Please pull latest changes"
74
+ if [[ ! $( git rev-list main ...origin/main --count ) -eq 0 ]]; then
75
+ echo " - WARN: There are upstream changes to main branch. Please pull latest changes"
76
76
read -p " Do you want to continue creating $BRANCH_NAME ? (y/n) " -n 1 -r
77
77
fi
78
78
# Create new branch for feature and check it out
100
100
101
101
# Create docker container if haven't already
102
102
echo " - Success! Running docker container doom-nvim-contrib-container..."
103
- mkdir -p " ${SCRIPT_DIR} /local-share-nvim" " ${SCRIPT_DIR} /workspace"
104
- echo " "
105
103
docker run \
106
104
-it \
107
105
-e UID=" 1000" \
108
106
-e GID=" 1000" \
109
107
-v " $SCRIPT_DIR " /doom-nvim-contrib:/home/doom/.config/nvim \
110
- -v " $SCRIPT_DIR " /local-share-nvim:/home/doom/.local/share/nvim \
111
108
-v " $SCRIPT_DIR " /workspace:/home/doom/workspace \
112
109
--name doom-nvim-contrib-container \
113
110
--user doom \
You can’t perform that action at this time.
0 commit comments