summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorKevin Willford <kewillf@microsoft.com>2017-08-10 18:32:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-14 21:09:46 (GMT)
commit9eaa858eb90802b9b6ce8a061229faba463f4bc3 (patch)
tree86beaf2687e279af7dcd54748c3932895d607531 /git-rebase.sh
parent738e88a20cd4c73930a18c759ed6f5704e85109f (diff)
downloadgit-9eaa858eb90802b9b6ce8a061229faba463f4bc3.zip
git-9eaa858eb90802b9b6ce8a061229faba463f4bc3.tar.gz
git-9eaa858eb90802b9b6ce8a061229faba463f4bc3.tar.bz2
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 2cf73b8..06f5082 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=
@@ -444,6 +445,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