Skip to content

Commit

Permalink
feat(dediverge): polish output
Browse files Browse the repository at this point in the history
# 50-character subject line
# 72-character wrapped longer description
  • Loading branch information
olets committed Dec 19, 2020
1 parent 01ec3bf commit 8afa79f
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions git-replay
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ __git_replay_dediverge() {
local stage_start_point_path
local -a stage_start_point_paths

__git_replay_print_log Looking for diverged branches...
__git_replay_print_log Checking the replay config for diverged branches...

# get all branches in rebase commands
rebase_upstream_paths=( ${(f)"$('command' 'yq' r --stripComments --printMode p $file 'rebase.*')"} )
Expand Down Expand Up @@ -832,12 +832,10 @@ __git_replay_dediverge() {
fi

if ! (( quieter )); then
'builtin' 'echo' \\nThe following branches have diverged from their remote tracking branches:
'builtin' 'echo' The following branches have diverged from their remote tracking branches:
for diverged_branch in $diverged_branches; do
'builtin' 'echo' $diverged_branch
done

'builtin' 'echo'
fi

# handle diverged branches
Expand All @@ -850,8 +848,6 @@ __git_replay_dediverge() {
if [[ $reply != 'y' && $reply != 'Y' ]]; then
continue
fi

'builtin' 'echo'
fi

if (( quiet )); then
Expand Down

0 comments on commit 8afa79f

Please sign in to comment.