midgard/git-mirror
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Improve wording

Browse source
This commit is contained in:
Midgard 2019-11-06 14:11:11 +01:00
parent ae9dd17ef3
commit f5592f3796
Signed by: midgard
GPG key ID: 511C112F1331BBB4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git-mirror.sh
View file

@ -79,15 +79,15 @@ for branchspec in "${branches[@]}"; do
follower_ref="refs/remotes/$remote/$branch" follower_ref="refs/remotes/$remote/$branch"
if ! ref_exists "$follower_ref"; then if ! ref_exists "$follower_ref"; then
echo "Branch doesn't exist yet at remote, creating" echo "Branch doesn't yet exist at remote, creating"
git reset --hard "$leader_sha" -- git reset --hard "$leader_sha" --
git push "$remote" "+HEAD:$branch" || { error "$remote $branch: failed to push"; continue; } git push "$remote" "+HEAD:$branch" || { error "$remote $branch: failed to push"; continue; }
elif is_ref_at_sha "$follower_ref" "$leader_sha"; then elif is_ref_at_sha "$follower_ref" "$leader_sha"; then
echo "Branch up to date" echo "Already up to date"
else else
echo "Branch existed at remote, updating" echo "Branch exists at remote, updating"
git reset --hard "$follower_ref" -- git reset --hard "$follower_ref" --
git merge --ff-only "$leader_sha" || { error "$remote $branch: FF not possible"; continue; } git merge --ff-only "$leader_sha" || { error "$remote $branch: FF not possible"; continue; }
git push "$remote" "+HEAD:$branch" || { error "$remote $branch: failed to push"; continue; } git push "$remote" "+HEAD:$branch" || { error "$remote $branch: failed to push"; continue; }