> -----Original Message-----
> From: Stefan Beller [mailto:sbel...@google.com]
> Sent: Wednesday, May 31, 2017 1:09 PM
> To: Kevin Willford <kcwillf...@gmail.com>
> Cc: git@vger.kernel.org; Junio C Hamano <gits...@pobox.com>; Kevin
> Willford <kewi...@microsoft.com>
> Subject: Re: [PATCH 2/2] rebase: turn on progress option by default for
> format-patch
> 
> On Wed, May 31, 2017 at 8:04 AM, Kevin Willford <kcwillf...@gmail.com>
> wrote:
> > 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.
> 
> This is not conflicting with Johannes rewrite of rebase in C?
> (rebase is a huge beast IIUC)

I will check with Johannes and see what possible conflicts there could be.
Since these are flags that get passed to the format-patch code, it shouldn't 
take much to put it in the C code as well.

> 
> When passing the progress option by default to formatting patches, maybe
> we should use start_progress_delay in the previous patch instead to omit
> the progress for short lived patch formatting sessions?
> (say a delay of one second?)
> 

I thought about that and certainly could do it but I have found it nice to have 
the number of patches that are generated in the output even for a small number 
or commits.  For example when I run a `git rebase master` and expect there to 
be only 2 commits, the message "Generating patch: 100% (2/2), done."  Gives me 
that good feeling that I did it right and didn't mess something up.  I'm good 
either way though.

> Thanks,
> Stefan
> 
> >
> > Signed-off-by: Kevin Willford <kewi...@microsoft.com>
> > ---
> >  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
> >

Reply via email to