diff options
| author | Kevin Willford <kewillf@microsoft.com> | 2017-08-10 14:32:56 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-14 14:09:46 -0700 |
| commit | 9eaa858eb90802b9b6ce8a061229faba463f4bc3 (patch) | |
| tree | 86beaf2687e279af7dcd54748c3932895d607531 | |
| parent | 738e88a20cd4c73930a18c759ed6f5704e85109f (diff) | |
| download | git-kw/rebase-progress.tar.gz | |
rebase: turn on progress option by default for format-patchkw/rebase-progress
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>
| -rw-r--r-- | git-rebase--am.sh | 1 | ||||
| -rwxr-xr-x | git-rebase.sh | 6 |
2 files changed, 7 insertions, 0 deletions
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 2cf73b88e8..06f5082dc3 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 |