From f5592f3796547ce758508847d5105f7d5f58c614 Mon Sep 17 00:00:00 2001 From: Midgard Date: Wed, 6 Nov 2019 14:11:11 +0100 Subject: [PATCH] Improve wording --- git-mirror.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-mirror.sh b/git-mirror.sh index 506c0cd..cd1160c 100755 --- a/git-mirror.sh +++ b/git-mirror.sh @@ -79,15 +79,15 @@ for branchspec in "${branches[@]}"; do follower_ref="refs/remotes/$remote/$branch" 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 push "$remote" "+HEAD:$branch" || { error "$remote $branch: failed to push"; continue; } elif is_ref_at_sha "$follower_ref" "$leader_sha"; then - echo "Branch up to date" + echo "Already up to date" else - echo "Branch existed at remote, updating" + echo "Branch exists at remote, updating" git reset --hard "$follower_ref" -- 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; }