summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 14:13:07 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-23 14:13:07 -0700
commitad7d3c3b391b73207fbb29da99d4f64ad0c54f00 (patch)
treeafdf7e3fd01cdb0d8a1451c46ff1c19fb9ec8de1 /git-rebase.sh
parent75010153e95f2b340f841953e3a0ce269ccf394f (diff)
parent9eaa858eb90802b9b6ce8a061229faba463f4bc3 (diff)
downloadgit-ad7d3c3b391b73207fbb29da99d4f64ad0c54f00.tar.gz
Merge branch 'kw/rebase-progress'
"git rebase", especially when it is run by mistake and ends up trying to replay many changes, spent long time in silence. The command has been taught to show progress report when it spends long time preparing these many changes to replay (which would give the user a chance to abort with ^C). * kw/rebase-progress: rebase: turn on progress option by default for format-patch format-patch: have progress option while generating patches
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 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