rebase: turn on progress option by default for format-patch
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>
Kevin Willford committed
Aug 10, 2017 at 14:32 UTC
9eaa858eb90802b9b6ce8a061229faba463f4bc3
2 files changed
+7
git-rebase--am.sh
+1
@@ -53,6 +53,7 @@ else
53
54
git format-patch -k --stdout --full-index --cherry-pick --right-only \
55
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
56
+ $git_format_patch_opt \
57
"$revisions" ${restrict_revision+^$restrict_revision} \
58
>"$GIT_DIR/rebased-patches"
59
ret=$?
git-rebase.sh
+6
@@ -73,6 +73,7 @@ test "$(git config --bool rebase.stat)" = true && diffstat=t
73
autostash="$(git config --bool rebase.autostash || echo false)"
74
fork_point=auto
75
git_am_opt=
76
+git_format_patch_opt=
77
rebase_root=
78
force_rebase=
79
allow_rerere_autoupdate=
@@ -444,6 +445,11 @@ else
445
state_dir="$apply_dir"
446
fi
447
448
+if test -t 2 && test -z "$GIT_QUIET"
449
+then
450
+ git_format_patch_opt="$git_format_patch_opt --progress"
451
+fi
452
+
453
if test -z "$rebase_root"
454
then
455
case "$#" in