From: Junio C Hamano <gitster@pobox•com>
To: Kevin Willford <kcwillford@gmail•com>
Cc: git@vger•kernel.org, peff@peff•net,
Kevin Willford <kewillf@microsoft•com>
Subject: Re: [PATCH v2 2/2] rebase: turn on progress option by default for format-patch
Date: Fri, 11 Aug 2017 15:22:58 -0700 [thread overview]
Message-ID: <xmqqshgxycal.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170810183256.12668-3-kewillf@microsoft.com> (Kevin Willford's message of "Thu, 10 Aug 2017 14:32:56 -0400")
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.
> ---
> 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
prev parent reply other threads:[~2017-08-11 22:23 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 15:04 [PATCH 0/2] Add progress to format-patch and rebase Kevin Willford
2017-05-31 15:04 ` [PATCH 1/2] format-patch: have progress option while generating patches Kevin Willford
2017-05-31 18:40 ` Stefan Beller
2017-05-31 19:31 ` Kevin Willford
2017-05-31 22:01 ` Jeff King
2017-06-01 4:10 ` Junio C Hamano
2017-06-01 11:15 ` Johannes Schindelin
2017-06-01 15:54 ` Jeff King
2017-05-31 15:04 ` [PATCH 2/2] rebase: turn on progress option by default for format-patch Kevin Willford
2017-05-31 19:08 ` Stefan Beller
2017-05-31 19:46 ` Kevin Willford
2017-05-31 20:27 ` Stefan Beller
2017-06-01 11:11 ` Johannes Schindelin
2017-05-31 22:11 ` Jeff King
2017-06-03 23:45 ` Junio C Hamano
2017-08-10 18:32 ` [PATCH v2 0/2] Add progress for format-patch and rebase Kevin Willford
2017-08-10 22:48 ` Junio C Hamano
2017-08-10 23:17 ` Jeff King
2017-08-10 18:32 ` [PATCH v2 1/2] format-patch: have progress option while generating patches Kevin Willford
2017-08-10 23:20 ` Jeff King
2017-08-11 22:18 ` Junio C Hamano
2017-08-12 8:06 ` Philip Oakley
2017-08-13 4:39 ` Jeff King
2017-08-14 16:45 ` Junio C Hamano
2017-08-14 18:35 ` Junio C Hamano
2017-08-14 22:29 ` Jeff King
2017-08-14 22:42 ` Junio C Hamano
2017-08-14 23:08 ` Jeff King
2017-08-14 23:23 ` Junio C Hamano
2017-08-19 17:39 ` [PATCH] progress: simplify "delayed" progress API Junio C Hamano
2017-08-19 20:58 ` Junio C Hamano
2017-08-20 7:43 ` Jeff King
2017-08-10 18:32 ` [PATCH v2 2/2] rebase: turn on progress option by default for format-patch Kevin Willford
2017-08-11 22:22 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqshgxycal.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kcwillford@gmail$(echo .)com \
--cc=kewillf@microsoft$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox