configs/scatterd-dotfiles
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Get the name of the main branch from remote

Browse source
This commit is contained in:
Daniel Barber 2020-06-15 12:31:52 -04:00 • committed by Geoff Harcourt
parent 69a95f60ea
commit 5a10c0c096
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/git-merge-branch
View file

@ -1,13 +1,19 @@
#!/bin/sh #!/bin/sh
main_branch="master"
if [ $# -gt 0 ]; then
main_branch=$1
fi
set -e set -e
if git symbolic-ref --short refs/remotes/origin/HEAD >/dev/null; then
main_branch="$(git symbolic-ref --short refs/remotes/origin/HEAD | sed 's@^origin/@@')" "$@"
else
echo "You don't have a primary branch reference set for your origin remote.
Use:
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/{name_of_your_primary_branch}
to set the reference and then try merging again."
exit
fi
git fetch origin git fetch origin
line_count=$(git diff origin/$main_branch..$main_branch | wc -l) line_count=$(git diff origin/$main_branch..$main_branch | wc -l)