diff options
Diffstat (limited to 'test-colors.sh')
| -rwxr-xr-x | test-colors.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test-colors.sh b/test-colors.sh index 6243c8f..f71b776 100755 --- a/test-colors.sh +++ b/test-colors.sh @@ -394,7 +394,7 @@ test_bash_colors_remote() { assertEquals "$expected" "$(bash_color_remote_commits)" assertEquals "$expected" "$(color_remote_commits)" - git pull origin master --quiet >/dev/null + git pull origin master --quiet --ff >/dev/null git push --quiet >/dev/null printf -v expected "m \x01remote-ahead\x02←\x01remote-reset\x02 2" @@ -440,7 +440,7 @@ test_zsh_colors_remote() { assertEquals "m 1 %{remote-diverged%}⇄%{remote-reset%} 1" "$(zsh_color_remote_commits)" - git pull origin master --quiet >/dev/null + git pull origin master --quiet --ff >/dev/null git push --quiet >/dev/null assertEquals "m %{remote-ahead%}←%{remote-reset%} 2" "$(zsh_color_remote_commits)" |