git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 5/8] git-rebase, sequencer: extend --quiet option for the interactive machinery

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 21, 2019, 16:10 UTC
Message-ID
<nycvar.QRO.7.76.6.1901211709090.41@tvgsbejvaqbjf.bet>
In-Reply-To
<20181211161139.31686-6-newren@gmail.com>
Hi Elijah,
On Tue, 11 Dec 2018, Elijah Newren wrote:
Show 21 quoted lines
> While 'quiet' and 'interactive' may sound like antonyms, the interactive
> machinery actually has logic that implements several
> interactive_rebase=implied cases (--exec, --keep-empty, --rebase-merges)
> which won't pop up an editor.  The rewrite of interactive rebase in C
> added a quiet option, though it only turns stats off.  Since we want to
> make the interactive machinery also take over for git-rebase--merge, it
> should fully implement the --quiet option.
> 
> git-rebase--interactive was already somewhat quieter than
> git-rebase--merge and git-rebase--am, possibly because cherry-pick has
> just traditionally been quieter.  As such, we only drop a few
> informational messages -- "Rebasing (n/m)" and "Successfully rebased..."
> 
> Also, for simplicity, remove the differences in how quiet and verbose
> options were recorded.  Having one be signalled by the presence of a
> "verbose" file in the state_dir, while the other was signalled by the
> contents of a "quiet" file was just weirdly inconsistent.  (This
> inconsistency pre-dated the rewrite into C.)  Make them consistent by
> having them both key off the presence of the file.
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>
This is convincing. I would like to point out, though...
Show 21 quoted lines
> ---
>  builtin/rebase.c      |  5 +----
>  git-legacy-rebase.sh  |  2 +-
>  git-rebase--common.sh |  2 +-
>  sequencer.c           | 23 +++++++++++++----------
>  sequencer.h           |  1 +
>  5 files changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 78e982298f..ec2e5fbf23 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -185,10 +185,7 @@ static int read_basic_state(struct rebase_options *opts)
>  	if (get_oid(buf.buf, &opts->orig_head))
>  		return error(_("invalid orig-head: '%s'"), buf.buf);
>  
> -	strbuf_reset(&buf);
> -	if (read_one(state_dir_path("quiet", opts), &buf))
> -		return -1;
> -	if (buf.len)
> +	if (file_exists(state_dir_path("quiet", opts)))

This changes the behavior. AFAIR the `quiet` file was always written, but contained `t` in quiet mode. I have to interrupt my review here, and will continue later, but maybe you will beat me to looking into that.

Ciao, Dscho

Show 114 quoted lines
>  		opts->flags &= ~REBASE_NO_QUIET;
>  	else
>  		opts->flags |= REBASE_NO_QUIET;
> diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
> index fccb33b959..f4088b7bda 100755
> --- a/git-legacy-rebase.sh
> +++ b/git-legacy-rebase.sh
> @@ -113,7 +113,7 @@ read_basic_state () {
>  	else
>  		orig_head=$(cat "$state_dir"/head)
>  	fi &&
> -	GIT_QUIET=$(cat "$state_dir"/quiet) &&
> +	test -f "$state_dir"/quiet && GIT_QUIET=t
>  	test -f "$state_dir"/verbose && verbose=t
>  	test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
>  	test -f "$state_dir"/strategy_opts &&
> diff --git a/git-rebase--common.sh b/git-rebase--common.sh
> index 7e39d22871..dc18c682fa 100644
> --- a/git-rebase--common.sh
> +++ b/git-rebase--common.sh
> @@ -10,7 +10,7 @@ write_basic_state () {
>  	echo "$head_name" > "$state_dir"/head-name &&
>  	echo "$onto" > "$state_dir"/onto &&
>  	echo "$orig_head" > "$state_dir"/orig-head &&
> -	echo "$GIT_QUIET" > "$state_dir"/quiet &&
> +	test t = "$GIT_QUIET" && : > "$state_dir"/quiet
>  	test t = "$verbose" && : > "$state_dir"/verbose
>  	test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
>  	test -n "$strategy_opts" && echo "$strategy_opts" > \
> diff --git a/sequencer.c b/sequencer.c
> index e1a4dd15f1..bc25615050 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -150,6 +150,7 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete")
>  static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
>  static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
>  static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
> +static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
>  static GIT_PATH_FUNC(rebase_path_signoff, "rebase-merge/signoff")
>  static GIT_PATH_FUNC(rebase_path_head_name, "rebase-merge/head-name")
>  static GIT_PATH_FUNC(rebase_path_onto, "rebase-merge/onto")
> @@ -157,7 +158,6 @@ static GIT_PATH_FUNC(rebase_path_autostash, "rebase-merge/autostash")
>  static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
>  static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
>  static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
> -static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
>  
>  static int git_sequencer_config(const char *k, const char *v, void *cb)
>  {
> @@ -2357,6 +2357,9 @@ static int read_populate_opts(struct replay_opts *opts)
>  		if (file_exists(rebase_path_verbose()))
>  			opts->verbose = 1;
>  
> +		if (file_exists(rebase_path_quiet()))
> +			opts->quiet = 1;
> +
>  		if (file_exists(rebase_path_signoff())) {
>  			opts->allow_ff = 0;
>  			opts->signoff = 1;
> @@ -2424,9 +2427,6 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
>  
>  	if (quiet)
>  		write_file(rebase_path_quiet(), "%s\n", quiet);
> -	else
> -		write_file(rebase_path_quiet(), "\n");
> -
>  	if (opts->verbose)
>  		write_file(rebase_path_verbose(), "%s", "");
>  	if (opts->strategy)
> @@ -3503,10 +3503,11 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
>  					fprintf(f, "%d\n", todo_list->done_nr);
>  					fclose(f);
>  				}
> -				fprintf(stderr, "Rebasing (%d/%d)%s",
> -					todo_list->done_nr,
> -					todo_list->total_nr,
> -					opts->verbose ? "\n" : "\r");
> +				if (!opts->quiet)
> +					fprintf(stderr, "Rebasing (%d/%d)%s",
> +						todo_list->done_nr,
> +						todo_list->total_nr,
> +						opts->verbose ? "\n" : "\r");
>  			}
>  			unlink(rebase_path_message());
>  			unlink(rebase_path_author_script());
> @@ -3738,8 +3739,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
>  		}
>  		apply_autostash(opts);
>  
> -		fprintf(stderr, "Successfully rebased and updated %s.\n",
> -			head_ref.buf);
> +		if (!opts->quiet)
> +			fprintf(stderr,
> +				"Successfully rebased and updated %s.\n",
> +				head_ref.buf);
>  
>  		strbuf_release(&buf);
>  		strbuf_release(&head_ref);
> diff --git a/sequencer.h b/sequencer.h
> index 5071a73563..729222b583 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -39,6 +39,7 @@ struct replay_opts {
>  	int allow_empty_message;
>  	int keep_redundant_commits;
>  	int verbose;
> +	int quiet;
>  
>  	int mainline;
>  
> -- 
> 2.20.0.8.g5de428d695
> 
>
Previous: Elijah NewrenNext: Elijah Newren
Message 35 of 67 in “Reimplement rebase --merge via interactive machinery”
  1. 0/2 Reimplement rebase --merge via interactive machineryElijah Newren, Nov 8, 2018
  2. 1/2 git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren, Nov 8, 2018
  3. Johannes SchindelinNov 12, 2018
  4. 2/2 rebase: Implement --merge via git-rebase--interactiveElijah Newren, Nov 8, 2018
  5. Johannes SchindelinNov 12, 2018
  6. Phillip WoodNov 12, 2018
  7. Johannes SchindelinNov 13, 2018
  8. Elijah NewrenNov 14, 2018
  9. Elijah NewrenNov 13, 2018
  10. Elijah NewrenNov 14, 2018
  11. Johannes SchindelinNov 15, 2018
  12. Elijah NewrenNov 8, 2018
  13. 0/7 Reimplement rebase --merge via interactive machineryElijah Newren, Nov 22, 2018
  14. 4/7 git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren, Nov 22, 2018
  15. 2/7 t5407: add a test demonstrating how interactive handles --skip differentlyElijah Newren, Nov 22, 2018
  16. 1/7 rebase: fix incompatible options error messageElijah Newren, Nov 22, 2018
  17. Johannes SchindelinNov 28, 2018
  18. Elijah NewrenNov 28, 2018
  19. Duy NguyenNov 28, 2018
  20. Elijah NewrenNov 28, 2018
  21. 7/7 rebase: Implement --merge via the interactive machineryElijah Newren, Nov 22, 2018
  22. 5/7 git-legacy-rebase: simplify unnecessary triply-nested ifElijah Newren, Nov 22, 2018
  23. 3/7 am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren, Nov 22, 2018
  24. 6/7 rebase: define linearization ordering and enforce itElijah Newren, Nov 22, 2018
  25. 0/8 Reimplement rebase --merge via interactive machineryElijah Newren, Dec 11, 2018
  26. 1/8 rebase: make builtin and legacy script error messages the sameElijah Newren, Dec 11, 2018
  27. 4/8 am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren, Dec 11, 2018
  28. Johannes SchindelinJan 21, 2019
  29. Elijah NewrenJan 21, 2019
  30. Johannes SchindelinJan 21, 2019
  31. 2/8 rebase: fix incompatible options error messageElijah Newren, Dec 11, 2018
  32. 6/8 git-legacy-rebase: simplify unnecessary triply-nested ifElijah Newren, Dec 11, 2018
  33. 8/8 rebase: Implement --merge via the interactive machineryElijah Newren, Dec 11, 2018
  34. 5/8 git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren, Dec 11, 2018
  35. Johannes SchindelinJan 21, 2019
  36. Elijah NewrenJan 21, 2019
  37. Johannes SchindelinJan 21, 2019
  38. Johannes SchindelinJan 21, 2019
  39. Junio C HamanoJan 22, 2019
  40. Phillip WoodFeb 20, 2019
  41. Elijah NewrenFeb 21, 2019
  42. 7/8 rebase: define linearization ordering and enforce itElijah Newren, Dec 11, 2018
  43. 3/8 t5407: add a test demonstrating how interactive handles --skip differentlyElijah Newren, Dec 11, 2018
  44. Elijah NewrenJan 7, 2019
  45. Junio C HamanoJan 7, 2019
  46. Junio C HamanoJan 7, 2019
  47. Elijah NewrenJan 7, 2019
  48. Elijah NewrenJan 11, 2019
  49. Johannes SchindelinJan 18, 2019
  50. Johannes SchindelinJan 18, 2019
  51. Junio C HamanoJan 18, 2019
  52. Elijah NewrenJan 18, 2019
  53. Johannes SchindelinJan 18, 2019
  54. Junio C HamanoJan 18, 2019
  55. Johannes SchindelinJan 21, 2019
  56. Johannes SchindelinJan 21, 2019
  57. Johannes SchindelinJan 21, 2019
  58. Elijah NewrenJan 21, 2019
  59. 0/8 Reimplement rebase --merge via interactive machineryElijah Newren, Jan 29, 2019
  60. 1/8 rebase: make builtin and legacy script error messages the sameElijah Newren, Jan 29, 2019
  61. 6/8 git-legacy-rebase: simplify unnecessary triply-nested ifElijah Newren, Jan 29, 2019
  62. 4/8 am, rebase--merge: do not overlook --skip'ed commits with post-rewriteElijah Newren, Jan 29, 2019
  63. 8/8 rebase: implement --merge via the interactive machineryElijah Newren, Jan 29, 2019
  64. 5/8 git-rebase, sequencer: extend --quiet option for the interactive machineryElijah Newren, Jan 29, 2019
  65. 7/8 rebase: define linearization ordering and enforce itElijah Newren, Jan 29, 2019
  66. 2/8 rebase: fix incompatible options error messageElijah Newren, Jan 29, 2019
  67. 3/8 t5407: add a test demonstrating how interactive handles --skip differentlyElijah Newren, Jan 29, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.