Merge branch 'jk/rebase-quiet-noop'

"git rebase --quiet" was not quite quiet when there is nothing to
do.

* jk/rebase-quiet-noop:
  rebase: silence "git checkout" for noop rebase
This commit is contained in:
Junio C Hamano 2015-05-11 14:23:49 -07:00
Родитель 0495983679 22946a9426
Коммит 352618287e
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -582,7 +582,7 @@ then
# Lazily switch to the target branch if needed... # Lazily switch to the target branch if needed...
test -z "$switch_to" || test -z "$switch_to" ||
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \ GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
git checkout "$switch_to" -- git checkout -q "$switch_to" --
say "$(eval_gettext "Current branch \$branch_name is up to date.")" say "$(eval_gettext "Current branch \$branch_name is up to date.")"
finish_rebase finish_rebase
exit 0 exit 0