dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-07-20 09:26:59 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fetch from master before counting number of commits

Browse source
This commit is contained in:
Simon Marsh 2021-08-19 10:01:57 +01:00
parent 8067906897
commit 6d75157819
No known key found for this signature in database
GPG key ID: 0FCCD13AE1CF7ED8
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
squash-my-commits
View file

@ -110,8 +110,26 @@ fi
########################################################################## ##########################################################################
# ensure the local branch is up to date
echo "Fetching dn42registry master"
git fetch dn42registry master
if [ $? -ne 0 ]
then
echo 'ERROR: Failed to fetch registry master branch'
echo 'Hint: you can use --ssh/--https to force use of ssh or https'
echo 'If all else fails, you can also set the DN42_REG_URL'
echo 'environment variable to directly specify the URL to fetch'
exit 1
fi
# find number of local commits # find number of local commits
count=$(git rev-list --count HEAD ^dn42registry/master) count=$(git rev-list --count HEAD ^dn42registry/master)
if [ $? -ne 0 ]
then
echo "ERROR: Failed to find the number of local commits"
echo "Please report this as a bug to the registry maintainters"
exit 1
fi
# if there are less then 2 local commits, there's nothing to do # if there are less then 2 local commits, there's nothing to do
if [ "$count" -lt 2 ] if [ "$count" -lt 2 ]
@ -126,22 +144,11 @@ then
exit 1 exit 1
fi fi
# ensure the local branch is up to date
echo 'Rebasing local changes against the registry master'
git fetch dn42registry master
if [ $? -ne 0 ]
then
echo 'ERROR: Failed to fetch registry master branch'
echo 'Hint: you can use --ssh/--https to force use of ssh or https'
echo 'If all else fails, you can also set the DN42_REG_URL'
echo 'environment variable to directly specify the URL to fetch'
exit 1
fi
# fail on errors from here onwards # fail on errors from here onwards
set -e set -e
# do the rebase thing # do the rebase thing
echo 'Rebasing local changes against the registry master'
git rebase dn42registry/master git rebase dn42registry/master
echo 'Squashing $count commits ...' echo 'Squashing $count commits ...'