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

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 11, 2017, 22:22 UTC
Message-ID: <xmqqshgxycal.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170810183256.12668-3-kewillf@microsoft.com>

Kevin Willford <kcwillford@gmail.com> writes:

> This change passes the progress option of format-patch checking
> that stderr is attached and rebase is not being run in quiet mode.

    Pass the "--progress" option to format-patch when the standard
    error stream goes to the terminal and the command is not run in
    "--quiet" mode.

Thanks for posting a refreshed version. Both patches make sense to me.

>
> Signed-off-by: Kevin Willford <kewillf@microsoft.com>

We want to see our authors and signed-off match. Do you want the employer address appear in our "shortlog -e" output, or your personal gmail address? I'll tenatively "fix" your author address to match the one at @microsoft.com while queuing.

Show 41 quoted lines

> ---
>  git-rebase--am.sh | 1 +
>  git-rebase.sh     | 6 ++++++
>  2 files changed, 7 insertions(+)
>
> diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> index 375239341f..ff98fe3a73 100644
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> @@ -53,6 +53,7 @@ else
>  
>  	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_opt \
>  		"$revisions" ${restrict_revision+^$restrict_revision} \
>  		>"$GIT_DIR/rebased-patches"
>  	ret=$?
> diff --git a/git-rebase.sh b/git-rebase.sh
> index f8b3d1fd97..ad8415e3cf 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -74,6 +74,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=
> @@ -445,6 +446,11 @@ else
>  	state_dir="$apply_dir"
>  fi
>  
> +if test -t 2 && test -z "$GIT_QUIET"
> +then
> +	git_format_patch_opt="$git_format_patch_opt --progress"
> +fi
> +
>  if test -z "$rebase_root"
>  then
>  	case "$#" in