undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: turn on progress option by default for format-patch

Browse Source 
Pass the "--progress" option to format-patch when the standard error
stream is connected to the terminal and "--quiet" is not given.

Signed-off-by: Kevin Willford <kewillf@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kevin Willford 2017-08-10 14:32:56 -04:00 committed by Junio C Hamano
parent 738e88a20c
commit 9eaa858eb9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-rebase--am.sh
View File

@ -53,6 +53,7 @@ else
git format-patch -k --stdout --full-index --cherry-pick --right-only \ git format-patch -k --stdout --full-index --cherry-pick --right-only \
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
$git_format_patch_opt \
"$revisions" ${restrict_revision+^$restrict_revision} \ "$revisions" ${restrict_revision+^$restrict_revision} \
>"$GIT_DIR/rebased-patches" >"$GIT_DIR/rebased-patches"
ret=$? ret=$?

6
git-rebase.sh
View File

@ -73,6 +73,7 @@ test "$(git config --bool rebase.stat)" = true && diffstat=t
autostash="$(git config --bool rebase.autostash || echo false)" autostash="$(git config --bool rebase.autostash || echo false)"
fork_point=auto fork_point=auto
git_am_opt= git_am_opt=
git_format_patch_opt=
rebase_root= rebase_root=
force_rebase= force_rebase=
allow_rerere_autoupdate= allow_rerere_autoupdate=
@ -444,6 +445,11 @@ else
state_dir="$apply_dir" state_dir="$apply_dir"
fi 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" if test -z "$rebase_root"
then then
case "$#" in case "$#" in