Skip to content

Add initial-branch to git init #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chiroptical wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add initial-branch to git init #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aabda8
Add initial-branch to git init
chiroptical Jun 2, 2023
a89d04e
Switch to main
chiroptical Jun 2, 2023
dbec637
Also check out main
chiroptical Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions texcollab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ function init(){
errors+=('Error <init>: why are we in a git repository?')
return 1
else
git init
git init --initial-branch=main
git checkout -b main
fi

# Create our .gitignore
Expand All @@ -172,11 +173,11 @@ function init(){
echo "*.tmp" >> .gitignore
echo "*~" >> .gitignore

# Now we can add, commit, push to master
# Now we can add, commit, push to main
git remote add origin $TEXCOLLAB_REMOTE_DOMAIN:$TEXCOLLAB_REMOTE_DIR.git
git add --all
git commit -m "Initial Commit"
git push origin master
git push origin main

# Make the student branch
git checkout -b $TEXCOLLAB_STUDENT
Expand Down Expand Up @@ -247,7 +248,7 @@ function commit(){
# You can't commit to another persons repo
# Obviously, people could mess with the configs, but I can't fix stupid
local current_branch=$(git branch | sed -n '/\* /s///p')
if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "master" ]; then
if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "main" ]; then
git add --all
# eval gets around issue with quotes
eval git commit -m \"${array[@]}\"
Expand Down Expand Up @@ -275,7 +276,7 @@ function push(){
# You can't push to another persons repo
# Obviously, people could mess with the configs, but I can't fix stupid
local current_branch=$(git branch | sed -n '/\* /s///p')
if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "master" ]; then
if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "main" ]; then
git push origin $current_branch
elif [ $current_branch == $TEXCOLLAB_STUDENT ]; then
git push origin $current_branch
Expand Down Expand Up @@ -464,7 +465,7 @@ function compare(){
# Strip path of '/' characters otherwise below will fail
local file_name=$(echo ${array[0]} | sed 's/\// /' | awk '{print $NF}')

if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "master" ]; then
if [ $TEXCOLLAB_CURRENT_USER == $TEXCOLLAB_ADVISOR ] && [ $current_branch == "main" ]; then
git show ${array[1]}:${array[0]} > ${array[1]}-$file_name.tmp
$TEXCOLLAB_MERGE_TOOL ${array[0]} ${array[1]}-$file_name.tmp
rm ${array[1]}-$file_name.tmp
Expand Down