This change passes the progress option of format-patch by
default and passes the -q --quiet option through to the
format-patch call so that it is respected as well.
Signed-off-by: Kevin Willford <kewillf@xxxxxxxxxxxxx>
---
git-rebase--am.sh | 5 +++--
git-rebase.sh | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 375239341f..ab2be30abf 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -51,8 +51,9 @@ then
else
rm -f "$GIT_DIR/rebased-patches"
- 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 $git_format_patch_opt -k --stdout --full-index \
+ --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ \
+ --no-renames --no-cover-letter --progress \
"$revisions" ${restrict_revision+^$restrict_revision} \
>"$GIT_DIR/rebased-patches"
ret=$?
diff --git a/git-rebase.sh b/git-rebase.sh
index db1deed846..b72e319ac9 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=
@@ -308,6 +309,7 @@ do
--quiet)
GIT_QUIET=t
git_am_opt="$git_am_opt -q"
+ git_format_patch_opt="$git_format_patch_opt -q"
verbose=
diffstat=
;;
--
2.13.0.92.g73a4ce6a77