Skip to content

do_git_checkout modified to checkout master or main for opus #733

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

Merged
rdp merged 2 commits into from
Apr 19, 2024
Merged

do_git_checkout modified to checkout master or main for opus #733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692954b
do_git_checkout modified to checkout master or main
syehoonkim Apr 4, 2024
1dff729
Merge pull request #1 from syehoonkim/syehoonkim-patch-1
syehoonkim Apr 4, 2024
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
10 changes: 9 additions & 1 deletion cross_compile_ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,15 @@ do_git_checkout() {
# reset will be useless if they didn't git_get_latest but pretty fast so who cares...plus what if they changed branches? :)
old_git_version=`git rev-parse HEAD`
if [[ -z $desired_branch ]]; then
desired_branch="origin/master"
# Check for either "origin/main" or "origin/master".
if [ $(git show-ref | grep -e origin\/main$ -c) = 1 ]; then
desired_branch="origin/main"
elif [ $(git show-ref | grep -e origin\/master$ -c) = 1 ]; then
desired_branch="origin/master"
else
echo "No valid git branch!"
exit 1
fi
fi
echo "doing git checkout $desired_branch"
git -c 'advice.detachedHead=false' checkout "$desired_branch" || (git_hard_reset && git -c 'advice.detachedHead=false' checkout "$desired_branch") || (git reset --hard "$desired_branch") || exit 1 # can't just use merge -f because might "think" patch files already applied when their changes have been lost, etc...
Expand Down