Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Edmundo Carmona Antoranz
On Sat, Dec 12, 2015 at 6:37 PM, Eric Sunshine wrote: >> >> Because, if the user didn't provide --[no-]progress option, then the >> value in show_progress will move forward being -1 and then in >> assign_blame, there will be progress output if you chose --incremental >> or porcelain. So, if you ch

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 7:36 PM, Edmundo Carmona Antoranz wrote: > On Sat, Dec 12, 2015 at 6:30 PM, Edmundo Carmona Antoranz > wrote: > H if the code in assign_blame changed to this, it would be > possible to allow the -1 to go through: > > if (show_progress > 0) > pi.progress = start

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 7:30 PM, Edmundo Carmona Antoranz wrote: > On Sat, Dec 12, 2015 at 6:17 PM, Eric Sunshine > wrote: >> The 'show_progress = 0' seems unnecessary. What if you did something >> like this instead? >> >> if (show_progress > 0 && (incremental || >> (output_optio

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Edmundo Carmona Antoranz
On Sat, Dec 12, 2015 at 6:30 PM, Edmundo Carmona Antoranz wrote: >> >> The 'show_progress = 0' seems unnecessary. What if you did something >> like this instead? >> >> if (show_progress > 0 && (incremental || >> (output_option & OUTPUT_PORCELAIN))) >> die("--progress can't

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Edmundo Carmona Antoranz
On Sat, Dec 12, 2015 at 6:17 PM, Eric Sunshine wrote: > Right here below the "---" line would be a good place to explain what > changed since the previous version. As an aid for reviewers, it's also > helpful to provide a link to the previous round, like this[1]. > > [1]: http://thread.gmane.org/g

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Eric Sunshine
On Sat, Dec 12, 2015 at 6:57 PM, Edmundo Carmona Antoranz wrote: > --progress can't be used with --incremental or > porcelain formats. > > git-annotate inherits the option as well > > Helped-by: Eric Sunshine > Signed-off-by: Edmundo Carmona Antoranz > --- Right here below the "---" line would

Re: [PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Edmundo Carmona Antoranz
On Sat, Dec 12, 2015 at 5:57 PM, Edmundo Carmona Antoranz wrote: > + if (incremental || (output_option & OUTPUT_PORCELAIN)) { > + if (show_progress > 0) > + die("--progress can't be used with --incremental or > porcelain formats"); > + show_

[PATCH v6] blame: add support for --[no-]progress option

2015-12-12 Thread Edmundo Carmona Antoranz
--progress can't be used with --incremental or porcelain formats. git-annotate inherits the option as well Helped-by: Eric Sunshine Signed-off-by: Edmundo Carmona Antoranz --- Documentation/blame-options.txt | 7 +++ Documentation/git-blame.txt | 3 ++- builtin/blame.c