Re: [PATCH 2/2] rebase: turn on progress option by default for format-patch

From: Stefan Beller <sbeller@google.com>
Date: May 31, 2017, 19:08 UTC
Message-ID: <CAGZ79kYns3CWS5acxGRk67mqdfBvPC=hngnNyovrOkjRRwhRCA@mail.gmail.com>
In-Reply-To: <20170531150427.7820-3-kewillf@microsoft.com>

On Wed, May 31, 2017 at 8:04 AM, Kevin Willford <kcwillford@gmail.com> wrote:

> This change passes the progress option of format-patch by
> default and passes the -q --quiet option through to the
> format-patch call so that it is respected as well.

This is not conflicting with Johannes rewrite of rebase in C? (rebase is a huge beast IIUC)

When passing the progress option by default to formatting patches, maybe we should use start_progress_delay in the previous patch instead to omit the progress for short lived patch formatting sessions? (say a delay of one second?)

Thanks, Stefan

Show 46 quoted lines

>
> Signed-off-by: Kevin Willford <kewillf@microsoft.com>
> ---
>  git-rebase--am.sh | 5 +++--
>  git-rebase.sh     | 2 ++
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> index 375239341f..ab2be30abf 100644
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> @@ -51,8 +51,9 @@ then
>  else
>         rm -f "$GIT_DIR/rebased-patches"
>
> -       git format-patch -k --stdout --full-index --cherry-pick --right-only \
> -               --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
> +       git format-patch $git_format_patch_opt -k --stdout --full-index \
> +               --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ \
> +               --no-renames --no-cover-letter --progress \
>                 "$revisions" ${restrict_revision+^$restrict_revision} \
>                 >"$GIT_DIR/rebased-patches"
>         ret=$?
> diff --git a/git-rebase.sh b/git-rebase.sh
> index db1deed846..b72e319ac9 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -73,6 +73,7 @@ test "$(git config --bool rebase.stat)" = true && diffstat=t
>  autostash="$(git config --bool rebase.autostash || echo false)"
>  fork_point=auto
>  git_am_opt=
> +git_format_patch_opt=
>  rebase_root=
>  force_rebase=
>  allow_rerere_autoupdate=
> @@ -308,6 +309,7 @@ do
>         --quiet)
>                 GIT_QUIET=t
>                 git_am_opt="$git_am_opt -q"
> +               git_format_patch_opt="$git_format_patch_opt -q"
>                 verbose=
>                 diffstat=
>                 ;;
> --
> 2.13.0.92.g73a4ce6a77
>