Override isatty with GIT_FORCE_TTY
cover Override isatty with GIT_FORCE_TTY
This is the resulting patch series from the discussion in the mailing list[1] and the Fugitive github issue[2].
The goal is to allow to override git decisiveness about not doing something when some fd is not a pty, which can hinder Fugitive.
I didn't annotate the location of the commits as I wasn't sure what was the correct one.. As it is not specific to a single mechanisms, but rather it is something global, is it fine as it is or should I use something as global, tree: or tree-wide:`?
I also didn't document this feature, or at least I wasn't sure where to document it (other than on these commits), I would compare it to the GIT_SMART_HTTP as it is something pretty niche and it isn't (and IMO shouldn't be) documented to the regular user.
Thank you,
Avishay
1. https://lore.kernel.org/git/CAJ-0OswsrnAuCwU6U=S2i1qKkg=66U-8RHSGqD2kh9T_30Yw9w@mail.gmail.com/
2. https://github.com/tpope/vim-fugitive/issues/1772
Avishay Matayev (3):
Change isatty's parameter to a *_FILENO define
Allow isatty to be overriden with GIT_FORCE_TTY
Add tests for GIT_FORCE_TTY
builtin/am.c | 2 +- builtin/bisect--helper.c | 4 ++-- builtin/blame.c | 2 +- builtin/bundle.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- cache.h | 3 +++ color.c | 2 +- column.c | 2 +- compat/mingw.c | 6 +++--- compat/mingw.h | 2 +- compat/winansi.c | 16 ++++++++-------- config.c | 5 +++++ date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- t/t9904-git-force-tty.sh | 38 ++++++++++++++++++++++++++++++++++++++ transport.c | 6 +++--- transport.h | 2 +- wt-status.c | 2 +- 41 files changed, 101 insertions(+), 55 deletions(-) create mode 100755 t/t9904-git-force-tty.sh
Signature · 1 line
2.25.1
PATCH 1/3 Change isatty's parameter to a *_FILENO define
This isn't a functional change.
The next patch in this series will rename all isatty calls anyway so I figured it is a good time to change the same calls to consistently use STD[IN|OUT|ERR]_FILENO.
--- builtin/am.c | 2 +- builtin/bisect--helper.c | 2 +- builtin/blame.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- column.c | 2 +- date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- transport.c | 6 +++--- transport.h | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-)
builtin/am.c +1 -1
@@ -2394,7 +2394,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)* intend to feed us a patch but wanted to continue * unattended. */ -if (argc || (resume.mode ==RESUME_FALSE && !isatty (0 ))) +if (argc || (resume.mode ==RESUME_FALSE && !isatty (STDIN_FILENO )))die (_ ("previous rebase directory %s still exists but mbox given." ), state.dir);
builtin/bisect--helper.c +1 -1
@@ -346,7 +346,7 @@ static int decide_next(const struct bisect_terms *terms,* although this is less optimum. */ warning (_ ("bisecting only with a %s commit" ), terms->term_bad); -if (!isatty (0 )) +if (!isatty (STDIN_FILENO ))return 0 ;/* * TRANSLATORS: Make sure to include [Y] and [n] in your
builtin/blame.c +1 -1
@@ -945,7 +945,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)die (_ ("--progress can't be used with --incremental or porcelain formats" )); show_progress =0 ; }else if (show_progress <0 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (0 < abbrev && abbrev < hexsz)/* one more abbrev length is needed for the boundary commit */
builtin/checkout.c +1 -1
@@ -1607,7 +1607,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,if (opts->quiet) opts->show_progress =0 ;else - opts->show_progress =isatty (2 ); + opts->show_progress =isatty (STDERR_FILENO ); }if (opts->conflict_style) {
builtin/commit-graph.c +2 -2
@@ -87,7 +87,7 @@ static int graph_verify(int argc, const char **argv)trace2_cmd_mode ("verify" ); - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv,NULL , builtin_commit_graph_verify_options, builtin_commit_graph_verify_usage,0 );
@@ -236,7 +236,7 @@ static int graph_write(int argc, const char **argv) OPT_END(), }; - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); opts.enable_changed_paths =-1 ; write_opts.size_multiple =2 ; write_opts.max_commits =0 ;
builtin/commit.c +1 -1
@@ -754,7 +754,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,strbuf_addbuf (&sb, &message); hook_arg1 ="message" ; }else if (logfile && !strcmp (logfile,"-" )) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));if (strbuf_read (&sb,0 ,0 ) <0 )die_errno (_ ("could not read log from standard input" ));
builtin/fsck.c +1 -1
@@ -790,7 +790,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_obj_options.strict =1 ;if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (verbose) show_progress =0 ;
builtin/gc.c +1 -1
@@ -1425,7 +1425,7 @@ static int maintenance_run(int argc, const char **argv, const char *prefix) };memset (&opts,0 ,sizeof (opts)); - opts.quiet = !isatty (2 ); + opts.quiet = !isatty (STDERR_FILENO );for (i =0 ; i <TASK__COUNT ; i++) tasks[i].selected_order =-1 ;
builtin/log.c +1 -1
@@ -69,7 +69,7 @@ struct line_opt_callback_data {static int session_is_interactive (void ) { -return isatty (1 ) ||pager_in_use (); +return isatty (STDOUT_FILENO ) ||pager_in_use (); }static int auto_decoration_style (void )
builtin/merge.c +2 -2
@@ -734,7 +734,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, o.subtree_shift ="" ; o.show_rename_progress = - show_progress ==-1 ?isatty (2 ) : show_progress; + show_progress ==-1 ?isatty (STDERR_FILENO ) : show_progress;for (x =0 ; x < xopts_nr; x++)if (parse_merge_opt (&o, xopts[x]))
@@ -1073,7 +1073,7 @@ static int default_edit_option(void)/* Use editor if stdin and stdout are the same and is a tty */ return (!fstat (0 , &st_stdin) && !fstat (1 , &st_stdout) && -isatty (0 ) &&isatty (1 ) && +isatty (STDIN_FILENO ) &&isatty (STDOUT_FILENO ) && st_stdin.st_dev == st_stdout.st_dev && st_stdin.st_ino == st_stdout.st_ino && st_stdin.st_mode == st_stdout.st_mode);
builtin/multi-pack-index.c +1 -1
@@ -154,7 +154,7 @@ int cmd_multi_pack_index(int argc, const char **argv,git_config (git_default_config,NULL ); -if (isatty (2 )) +if (isatty (STDERR_FILENO )) opts.flags |=MIDX_PROGRESS ; argc = parse_options(argc, argv, prefix, builtin_multi_pack_index_options,
builtin/pack-objects.c +1 -1
@@ -4016,7 +4016,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)if (git_env_bool (GIT_TEST_WRITE_REV_INDEX ,0 )) pack_idx_opts.flags |=WRITE_REV ; - progress =isatty (2 ); + progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv, prefix, pack_objects_options, pack_usage,0 );
builtin/pack-redundant.c +1 -1
@@ -621,7 +621,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)/* ignore objects given on stdin */ llist_init (&ignore); -if (!isatty (0 )) { +if (!isatty (STDIN_FILENO )) {while (fgets (buf,sizeof (buf), stdin)) { oid =xmalloc (sizeof (*oid));if (get_oid_hex (buf, oid))
builtin/prune-packed.c +1 -1
@@ -9,7 +9,7 @@ static const char * const prune_packed_usage[] = {int cmd_prune_packed (int argc,const char **argv,const char *prefix) { -int opts =isatty (2 ) ?PRUNE_PACKED_VERBOSE :0 ; +int opts =isatty (STDERR_FILENO ) ?PRUNE_PACKED_VERBOSE :0 ;const struct option prune_packed_options[] = {OPT_BIT ('n' ,"dry-run" , &opts,N_ ("dry run" ),PRUNE_PACKED_DRY_RUN ),
builtin/prune.c +1 -1
@@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) }if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (exclude_promisor_objects) { fetch_if_missing =0 ; revs.exclude_promisor_objects =1 ;
builtin/rebase.c +1 -1
@@ -1745,7 +1745,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" ); -if (isatty (2 ) && options.flags &REBASE_NO_QUIET ) +if (isatty (STDERR_FILENO ) && options.flags &REBASE_NO_QUIET )strbuf_addstr (&options.git_format_patch_opt," --progress" );if (options.git_am_opts.nr || options.type ==REBASE_APPLY ) {
builtin/repack.c +1 -1
@@ -710,7 +710,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) }strbuf_release (&buf); } -if (!po_args.quiet &&isatty (2 )) +if (!po_args.quiet &&isatty (STDERR_FILENO )) opts |=PRUNE_PACKED_VERBOSE ;prune_packed_objects (opts);
builtin/send-pack.c +1 -1
@@ -261,7 +261,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) }if (progress ==-1 ) - progress = !args.quiet &&isatty (2 ); + progress = !args.quiet &&isatty (STDERR_FILENO ); args.progress = progress;if (args.stateless_rpc) {
builtin/shortlog.c +2 -2
@@ -406,10 +406,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)string_list_sort (&log.trailers);/* assume HEAD if from a tty */ -if (!nongit && !rev.pending.nr &&isatty (0 )) +if (!nongit && !rev.pending.nr &&isatty (STDIN_FILENO ))add_head_to_pending (&rev);if (rev.pending.nr ==0 ) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));read_from_stdin (&log); }
builtin/sparse-checkout.c +1 -1
@@ -114,7 +114,7 @@ static int update_working_directory(struct pattern_list *pl) r->index->sparse_checkout_patterns = pl;memset (&o,0 ,sizeof (o)); - o.verbose_update =isatty (2 ); + o.verbose_update =isatty (STDERR_FILENO ); o.update =1 ; o.head_idx =-1 ; o.src_index = r->index;
builtin/unpack-objects.c +1 -1
@@ -522,7 +522,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)git_config (git_default_config,NULL ); - quiet = !isatty (2 ); + quiet = !isatty (STDERR_FILENO );for (i =1 ; i < argc; i++) {const char *arg = argv[i];
column.c +1 -1
@@ -211,7 +211,7 @@ int finalize_colopts(unsigned int *colopts, int stdout_is_tty) {if ((*colopts &COL_ENABLE_MASK ) ==COL_AUTO ) {if (stdout_is_tty <0 ) - stdout_is_tty =isatty (1 ); + stdout_is_tty =isatty (STDOUT_FILENO ); *colopts &= ~COL_ENABLE_MASK ;if (stdout_is_tty ||pager_in_use ()) *colopts |=COL_ENABLED ;
date.c +1 -1
@@ -969,7 +969,7 @@ void parse_date_format(const char *format, struct date_mode *mode)/* "auto:foo" is "if tty/pager, then foo, otherwise normal" */ if (skip_prefix (format,"auto:" , &p)) { -if (isatty (1 ) ||pager_in_use ()) +if (isatty (STDOUT_FILENO ) ||pager_in_use ()) format = p;else format ="default" ;
editor.c +1 -1
@@ -58,7 +58,7 @@ static int launch_specified_editor(const char *editor, const char *path,const char *args[] = { editor,NULL ,NULL };struct child_process p =CHILD_PROCESS_INIT ;int ret, sig; -int print_waiting_for_editor = advice_waiting_for_editor &&isatty (2 ); +int print_waiting_for_editor = advice_waiting_for_editor &&isatty (STDERR_FILENO );if (print_waiting_for_editor) {/*
pager.c +2 -2
@@ -101,7 +101,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)void setup_pager (void ) { -const char *pager =git_pager (isatty (1 )); +const char *pager =git_pager (isatty (STDOUT_FILENO ));if (!pager)return ;
@@ -128,7 +128,7 @@ void setup_pager(void)/* original process continues, but writes to the pipe */ dup2 (pager_process.in,1 ); -if (isatty (2 )) +if (isatty (STDERR_FILENO ))dup2 (pager_process.in,2 );close (pager_process.in);
preload-index.c +1 -1
@@ -121,7 +121,7 @@ void preload_index(struct index_state *index,memset (&data,0 ,sizeof (data));memset (&pd,0 ,sizeof (pd)); -if (refresh_flags &REFRESH_PROGRESS &&isatty (2 )) { +if (refresh_flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) { pd.progress =start_delayed_progress (_ ("Refreshing index" ), index->cache_nr);pthread_mutex_init (&pd.mutex,NULL ); }
read-cache.c +1 -1
@@ -1568,7 +1568,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,int t2_sum_lstat =0 ;int t2_sum_scan =0 ; -if (flags &REFRESH_PROGRESS &&isatty (2 )) +if (flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) progress =start_delayed_progress (_ ("Refresh index" ), istate->cache_nr);
remote-curl.c +1 -1
@@ -1483,7 +1483,7 @@ int cmd_main(int argc, const char **argv) } options.verbosity =1 ; - options.progress = !!isatty (2 ); + options.progress = !!isatty (STDERR_FILENO ); options.thin =1 ;string_list_init (&options.deepen_not,1 );string_list_init (&options.push_options,1 );
sequencer.c +2 -2
@@ -2040,7 +2040,7 @@ static int should_edit(struct replay_opts *opts) {* commits; continue_single_pick() handles the conflicted * commits itself instead of calling this function. */ -return (opts->action ==REPLAY_REVERT &&isatty (0 )) ?1 :0 ; +return (opts->action ==REPLAY_REVERT &&isatty (STDIN_FILENO )) ?1 :0 ;return opts->edit; }
@@ -4589,7 +4589,7 @@ static int continue_single_pick(struct repository *r, struct replay_opts *opts)* we want to edit if the user asked for it, or if they didn't specify * and stdin is a tty. */ -if (!opts->edit || (opts->edit <0 && !isatty (0 ))) +if (!opts->edit || (opts->edit <0 && !isatty (STDIN_FILENO )))/* * Include --cleanup=strip as well because we don't want the * "# Conflicts:" messages.
sideband.c +1 -1
@@ -126,7 +126,7 @@ int demultiplex_sideband(const char *me, int status,int band;if (!suffix) { -if (isatty (2 ) && !is_terminal_dumb ()) +if (isatty (STDERR_FILENO ) && !is_terminal_dumb ()) suffix =ANSI_SUFFIX ;else suffix =DUMB_SUFFIX ;
transport.c +3 -3
@@ -1051,7 +1051,7 @@ struct transport *transport_get(struct remote *remote, const char *url)const char *helper;struct transport *ret =xcalloc (1 ,sizeof (*ret)); - ret->progress =isatty (2 ); + ret->progress =isatty (STDERR_FILENO );string_list_init (&ret->pack_lockfiles,1 );if (!remote)
@@ -1168,12 +1168,12 @@ void transport_set_verbosity(struct transport *transport, int verbosity,* . Report progress, if force_progress is 1 (ie. --progress). * . Don't report progress, if force_progress is 0 (ie. --no-progress). * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). -* . Report progress if isatty(2) is 1. +* . Report progress if isatty(STDERR_FILENO) is 1. **/ if (force_progress >=0 ) transport->progress = !!force_progress;else - transport->progress = verbosity >=0 &&isatty (2 ); + transport->progress = verbosity >=0 &&isatty (STDERR_FILENO ); }static void die_with_unpushed_submodules (struct string_list *needs_pushing)
transport.h +1 -1
@@ -110,7 +110,7 @@ struct transport { signed verbose : 3;/** * Transports should not set this directly, and should use this -* value without having to check isatty(2), -q/--quiet +* value without having to check isatty(STDERR_FILENO), -q/--quiet * (transport->verbose < 0), etc. - checking has already been done * in transport_set_verbosity(). **/
Signature · 1 line
2.25.1
Re: [PATCH 1/3] Change isatty's parameter to a *_FILENO define
Quoted 1 line · Avishay Matayev
This isn't a functional change.
This does not seem to make the code any easier to follow, though. Is this amount of code churn really needed?
Quoted 512 lines
The next patch in this series will rename all isatty calls anyway so I figured it is a good time to change the same calls to consistently use STD[IN|OUT|ERR]_FILENO.
Signed-off-by Avishay Matayev <[email protected]>--- builtin/am.c | 2 +- builtin/bisect--helper.c | 2 +- builtin/blame.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- column.c | 2 +- date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- transport.c | 6 +++--- transport.h | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-)builtin/am.c +1
-1@@ -2394,7 +2394,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)* intend to feed us a patch but wanted to continue * unattended. */ -if (argc || (resume.mode ==RESUME_FALSE && !isatty (0 ))) +if (argc || (resume.mode ==RESUME_FALSE && !isatty (STDIN_FILENO )))die (_ ("previous rebase directory %s still exists but mbox given." ), state.dir);builtin/bisect--helper.c +1
-1@@ -346,7 +346,7 @@ static int decide_next(const struct bisect_terms *terms,* although this is less optimum. */ warning (_ ("bisecting only with a %s commit" ), terms->term_bad); -if (!isatty (0 )) +if (!isatty (STDIN_FILENO ))return 0 ;/* * TRANSLATORS: Make sure to include [Y] and [n] in your builtin/blame.c +1
-1@@ -945,7 +945,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)die (_ ("--progress can't be used with --incremental or porcelain formats" )); show_progress =0 ; }else if (show_progress <0 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (0 < abbrev && abbrev < hexsz)/* one more abbrev length is needed for the boundary commit */ builtin/checkout.c +1
-1@@ -1607,7 +1607,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,if (opts->quiet) opts->show_progress =0 ;else - opts->show_progress =isatty (2 ); + opts->show_progress =isatty (STDERR_FILENO ); }if (opts->conflict_style) {builtin/commit-graph.c +2
-2@@ -87,7 +87,7 @@ static int graph_verify(int argc, const char **argv)trace2_cmd_mode ("verify" ); - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv,NULL , builtin_commit_graph_verify_options, builtin_commit_graph_verify_usage,0 );@@ -236,7 +236,7 @@ static int graph_write(int argc, const char **argv) OPT_END(), }; - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); opts.enable_changed_paths =-1 ; write_opts.size_multiple =2 ; write_opts.max_commits =0 ;builtin/commit.c +1
-1@@ -754,7 +754,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,strbuf_addbuf (&sb, &message); hook_arg1 ="message" ; }else if (logfile && !strcmp (logfile,"-" )) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));if (strbuf_read (&sb,0 ,0 ) <0 )die_errno (_ ("could not read log from standard input" ));builtin/fsck.c +1
-1@@ -790,7 +790,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_obj_options.strict =1 ;if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (verbose) show_progress =0 ;builtin/gc.c +1
-1@@ -1425,7 +1425,7 @@ static int maintenance_run(int argc, const char **argv, const char *prefix) };memset (&opts,0 ,sizeof (opts)); - opts.quiet = !isatty (2 ); + opts.quiet = !isatty (STDERR_FILENO );for (i =0 ; i <TASK__COUNT ; i++) tasks[i].selected_order =-1 ;builtin/log.c +1
-1@@ -69,7 +69,7 @@ struct line_opt_callback_data {static int session_is_interactive (void ) { -return isatty (1 ) ||pager_in_use (); +return isatty (STDOUT_FILENO ) ||pager_in_use (); }static int auto_decoration_style (void )builtin/merge.c +2
-2@@ -734,7 +734,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, o.subtree_shift ="" ; o.show_rename_progress = - show_progress ==-1 ?isatty (2 ) : show_progress; + show_progress ==-1 ?isatty (STDERR_FILENO ) : show_progress;for (x =0 ; x < xopts_nr; x++)if (parse_merge_opt (&o, xopts[x]))@@ -1073,7 +1073,7 @@ static int default_edit_option(void)/* Use editor if stdin and stdout are the same and is a tty */ return (!fstat (0 , &st_stdin) && !fstat (1 , &st_stdout) && -isatty (0 ) &&isatty (1 ) && +isatty (STDIN_FILENO ) &&isatty (STDOUT_FILENO ) && st_stdin.st_dev == st_stdout.st_dev && st_stdin.st_ino == st_stdout.st_ino && st_stdin.st_mode == st_stdout.st_mode);builtin/multi-pack-index.c +1
-1@@ -154,7 +154,7 @@ int cmd_multi_pack_index(int argc, const char **argv,git_config (git_default_config,NULL ); -if (isatty (2 )) +if (isatty (STDERR_FILENO )) opts.flags |=MIDX_PROGRESS ; argc = parse_options(argc, argv, prefix, builtin_multi_pack_index_options,builtin/pack-objects.c +1
-1@@ -4016,7 +4016,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)if (git_env_bool (GIT_TEST_WRITE_REV_INDEX ,0 )) pack_idx_opts.flags |=WRITE_REV ; - progress =isatty (2 ); + progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv, prefix, pack_objects_options, pack_usage,0 );builtin/pack-redundant.c +1
-1@@ -621,7 +621,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)/* ignore objects given on stdin */ llist_init (&ignore); -if (!isatty (0 )) { +if (!isatty (STDIN_FILENO )) {while (fgets (buf,sizeof (buf), stdin)) { oid =xmalloc (sizeof (*oid));if (get_oid_hex (buf, oid))builtin/prune-packed.c +1
-1@@ -9,7 +9,7 @@ static const char * const prune_packed_usage[] = {int cmd_prune_packed (int argc,const char **argv,const char *prefix) { -int opts =isatty (2 ) ?PRUNE_PACKED_VERBOSE :0 ; +int opts =isatty (STDERR_FILENO ) ?PRUNE_PACKED_VERBOSE :0 ;const struct option prune_packed_options[] = {OPT_BIT ('n' ,"dry-run" , &opts,N_ ("dry run" ),PRUNE_PACKED_DRY_RUN ),builtin/prune.c +1
-1@@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) }if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (exclude_promisor_objects) { fetch_if_missing =0 ; revs.exclude_promisor_objects =1 ;builtin/rebase.c +1
-1@@ -1745,7 +1745,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" ); -if (isatty (2 ) && options.flags &REBASE_NO_QUIET ) +if (isatty (STDERR_FILENO ) && options.flags &REBASE_NO_QUIET )strbuf_addstr (&options.git_format_patch_opt," --progress" );if (options.git_am_opts.nr || options.type ==REBASE_APPLY ) {builtin/repack.c +1
-1@@ -710,7 +710,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) }strbuf_release (&buf); } -if (!po_args.quiet &&isatty (2 )) +if (!po_args.quiet &&isatty (STDERR_FILENO )) opts |=PRUNE_PACKED_VERBOSE ;prune_packed_objects (opts);builtin/send-pack.c +1
-1@@ -261,7 +261,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) }if (progress ==-1 ) - progress = !args.quiet &&isatty (2 ); + progress = !args.quiet &&isatty (STDERR_FILENO ); args.progress = progress;if (args.stateless_rpc) {builtin/shortlog.c +2
-2@@ -406,10 +406,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)string_list_sort (&log.trailers);/* assume HEAD if from a tty */ -if (!nongit && !rev.pending.nr &&isatty (0 )) +if (!nongit && !rev.pending.nr &&isatty (STDIN_FILENO ))add_head_to_pending (&rev);if (rev.pending.nr ==0 ) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));read_from_stdin (&log); }builtin/sparse-checkout.c +1
-1@@ -114,7 +114,7 @@ static int update_working_directory(struct pattern_list *pl) r->index->sparse_checkout_patterns = pl;memset (&o,0 ,sizeof (o)); - o.verbose_update =isatty (2 ); + o.verbose_update =isatty (STDERR_FILENO ); o.update =1 ; o.head_idx =-1 ; o.src_index = r->index;builtin/unpack-objects.c +1
-1@@ -522,7 +522,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)git_config (git_default_config,NULL ); - quiet = !isatty (2 ); + quiet = !isatty (STDERR_FILENO );for (i =1 ; i < argc; i++) {const char *arg = argv[i];column.c +1
-1@@ -211,7 +211,7 @@ int finalize_colopts(unsigned int *colopts, int stdout_is_tty) {if ((*colopts &COL_ENABLE_MASK ) ==COL_AUTO ) {if (stdout_is_tty <0 ) - stdout_is_tty =isatty (1 ); + stdout_is_tty =isatty (STDOUT_FILENO ); *colopts &= ~COL_ENABLE_MASK ;if (stdout_is_tty ||pager_in_use ()) *colopts |=COL_ENABLED ;date.c +1
-1@@ -969,7 +969,7 @@ void parse_date_format(const char *format, struct date_mode *mode)/* "auto:foo" is "if tty/pager, then foo, otherwise normal" */ if (skip_prefix (format,"auto:" , &p)) { -if (isatty (1 ) ||pager_in_use ()) +if (isatty (STDOUT_FILENO ) ||pager_in_use ()) format = p;else format ="default" ;editor.c +1
-1@@ -58,7 +58,7 @@ static int launch_specified_editor(const char *editor, const char *path,const char *args[] = { editor,NULL ,NULL };struct child_process p =CHILD_PROCESS_INIT ;int ret, sig; -int print_waiting_for_editor = advice_waiting_for_editor &&isatty (2 ); +int print_waiting_for_editor = advice_waiting_for_editor &&isatty (STDERR_FILENO );if (print_waiting_for_editor) {/* pager.c +2
-2@@ -101,7 +101,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)void setup_pager (void ) { -const char *pager =git_pager (isatty (1 )); +const char *pager =git_pager (isatty (STDOUT_FILENO ));if (!pager)return ;@@ -128,7 +128,7 @@ void setup_pager(void)/* original process continues, but writes to the pipe */ dup2 (pager_process.in,1 ); -if (isatty (2 )) +if (isatty (STDERR_FILENO ))dup2 (pager_process.in,2 );close (pager_process.in);preload-index.c +1
-1@@ -121,7 +121,7 @@ void preload_index(struct index_state *index,memset (&data,0 ,sizeof (data));memset (&pd,0 ,sizeof (pd)); -if (refresh_flags &REFRESH_PROGRESS &&isatty (2 )) { +if (refresh_flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) { pd.progress =start_delayed_progress (_ ("Refreshing index" ), index->cache_nr);pthread_mutex_init (&pd.mutex,NULL ); }read-cache.c +1
-1@@ -1568,7 +1568,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,int t2_sum_lstat =0 ;int t2_sum_scan =0 ; -if (flags &REFRESH_PROGRESS &&isatty (2 )) +if (flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) progress =start_delayed_progress (_ ("Refresh index" ), istate->cache_nr);remote-curl.c +1
-1@@ -1483,7 +1483,7 @@ int cmd_main(int argc, const char **argv) } options.verbosity =1 ; - options.progress = !!isatty (2 ); + options.progress = !!isatty (STDERR_FILENO ); options.thin =1 ;string_list_init (&options.deepen_not,1 );string_list_init (&options.push_options,1 );sequencer.c +2
-2@@ -2040,7 +2040,7 @@ static int should_edit(struct replay_opts *opts) {* commits; continue_single_pick() handles the conflicted * commits itself instead of calling this function. */ -return (opts->action ==REPLAY_REVERT &&isatty (0 )) ?1 :0 ; +return (opts->action ==REPLAY_REVERT &&isatty (STDIN_FILENO )) ?1 :0 ;return opts->edit; }@@ -4589,7 +4589,7 @@ static int continue_single_pick(struct repository *r, struct replay_opts *opts)* we want to edit if the user asked for it, or if they didn't specify * and stdin is a tty. */ -if (!opts->edit || (opts->edit <0 && !isatty (0 ))) +if (!opts->edit || (opts->edit <0 && !isatty (STDIN_FILENO )))/* * Include --cleanup=strip as well because we don't want the * "# Conflicts:" messages. sideband.c +1
-1@@ -126,7 +126,7 @@ int demultiplex_sideband(const char *me, int status,int band;if (!suffix) { -if (isatty (2 ) && !is_terminal_dumb ()) +if (isatty (STDERR_FILENO ) && !is_terminal_dumb ()) suffix =ANSI_SUFFIX ;else suffix =DUMB_SUFFIX ;transport.c +3
-3@@ -1051,7 +1051,7 @@ struct transport *transport_get(struct remote *remote, const char *url)const char *helper;struct transport *ret =xcalloc (1 ,sizeof (*ret)); - ret->progress =isatty (2 ); + ret->progress =isatty (STDERR_FILENO );string_list_init (&ret->pack_lockfiles,1 );if (!remote)@@ -1168,12 +1168,12 @@ void transport_set_verbosity(struct transport *transport, int verbosity,* . Report progress, if force_progress is 1 (ie. --progress). * . Don't report progress, if force_progress is 0 (ie. --no-progress). * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). -* . Report progress if isatty(2) is 1. +* . Report progress if isatty(STDERR_FILENO) is 1. **/ if (force_progress >=0 ) transport->progress = !!force_progress;else - transport->progress = verbosity >=0 &&isatty (2 ); + transport->progress = verbosity >=0 &&isatty (STDERR_FILENO ); }static void die_with_unpushed_submodules (struct string_list *needs_pushing)transport.h +1
-1@@ -110,7 +110,7 @@ struct transport { signed verbose : 3;/** * Transports should not set this directly, and should use this -* value without having to check isatty(2), -q/--quiet +* value without having to check isatty(STDERR_FILENO), -q/--quiet * (transport->verbose < 0), etc. - checking has already been done * in transport_set_verbosity(). **/
Re: [PATCH 1/3] Change isatty's parameter to a *_FILENO define
Quoted 8 lines · Junio C Hamano
Quoted 1 line · Avishay Matayev
This isn't a functional change.
This does not seem to make the code any easier to follow, though. Is this amount of code churn really needed?
I don't think it makes the code worse either. There are already a few occurrences
of this in the current code, I found this nicer and thought I should create a patch
for consistency's sake. It is of course not mandatory so if you feel strongly about it
I can remove it.
Quoted 512 lines
Quoted 512 lines
The next patch in this series will rename all isatty calls anyway so I figured it is a good time to change the same calls to consistently use STD[IN|OUT|ERR]_FILENO.
Signed-off-by Avishay Matayev <[email protected]>--- builtin/am.c | 2 +- builtin/bisect--helper.c | 2 +- builtin/blame.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- column.c | 2 +- date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- transport.c | 6 +++--- transport.h | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-)builtin/am.c +1
-1@@ -2394,7 +2394,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)* intend to feed us a patch but wanted to continue * unattended. */ -if (argc || (resume.mode ==RESUME_FALSE && !isatty (0 ))) +if (argc || (resume.mode ==RESUME_FALSE && !isatty (STDIN_FILENO )))die (_ ("previous rebase directory %s still exists but mbox given." ), state.dir);builtin/bisect--helper.c +1
-1@@ -346,7 +346,7 @@ static int decide_next(const struct bisect_terms *terms,* although this is less optimum. */ warning (_ ("bisecting only with a %s commit" ), terms->term_bad); -if (!isatty (0 )) +if (!isatty (STDIN_FILENO ))return 0 ;/* * TRANSLATORS: Make sure to include [Y] and [n] in your builtin/blame.c +1
-1@@ -945,7 +945,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)die (_ ("--progress can't be used with --incremental or porcelain formats" )); show_progress =0 ; }else if (show_progress <0 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (0 < abbrev && abbrev < hexsz)/* one more abbrev length is needed for the boundary commit */ builtin/checkout.c +1
-1@@ -1607,7 +1607,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,if (opts->quiet) opts->show_progress =0 ;else - opts->show_progress =isatty (2 ); + opts->show_progress =isatty (STDERR_FILENO ); }if (opts->conflict_style) {builtin/commit-graph.c +2
-2@@ -87,7 +87,7 @@ static int graph_verify(int argc, const char **argv)trace2_cmd_mode ("verify" ); - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv,NULL , builtin_commit_graph_verify_options, builtin_commit_graph_verify_usage,0 );@@ -236,7 +236,7 @@ static int graph_write(int argc, const char **argv) OPT_END(), }; - opts.progress =isatty (2 ); + opts.progress =isatty (STDERR_FILENO ); opts.enable_changed_paths =-1 ; write_opts.size_multiple =2 ; write_opts.max_commits =0 ;builtin/commit.c +1
-1@@ -754,7 +754,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,strbuf_addbuf (&sb, &message); hook_arg1 ="message" ; }else if (logfile && !strcmp (logfile,"-" )) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));if (strbuf_read (&sb,0 ,0 ) <0 )die_errno (_ ("could not read log from standard input" ));builtin/fsck.c +1
-1@@ -790,7 +790,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_obj_options.strict =1 ;if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (verbose) show_progress =0 ;builtin/gc.c +1
-1@@ -1425,7 +1425,7 @@ static int maintenance_run(int argc, const char **argv, const char *prefix) };memset (&opts,0 ,sizeof (opts)); - opts.quiet = !isatty (2 ); + opts.quiet = !isatty (STDERR_FILENO );for (i =0 ; i <TASK__COUNT ; i++) tasks[i].selected_order =-1 ;builtin/log.c +1
-1@@ -69,7 +69,7 @@ struct line_opt_callback_data {static int session_is_interactive (void ) { -return isatty (1 ) ||pager_in_use (); +return isatty (STDOUT_FILENO ) ||pager_in_use (); }static int auto_decoration_style (void )builtin/merge.c +2
-2@@ -734,7 +734,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, o.subtree_shift ="" ; o.show_rename_progress = - show_progress ==-1 ?isatty (2 ) : show_progress; + show_progress ==-1 ?isatty (STDERR_FILENO ) : show_progress;for (x =0 ; x < xopts_nr; x++)if (parse_merge_opt (&o, xopts[x]))@@ -1073,7 +1073,7 @@ static int default_edit_option(void)/* Use editor if stdin and stdout are the same and is a tty */ return (!fstat (0 , &st_stdin) && !fstat (1 , &st_stdout) && -isatty (0 ) &&isatty (1 ) && +isatty (STDIN_FILENO ) &&isatty (STDOUT_FILENO ) && st_stdin.st_dev == st_stdout.st_dev && st_stdin.st_ino == st_stdout.st_ino && st_stdin.st_mode == st_stdout.st_mode);builtin/multi-pack-index.c +1
-1@@ -154,7 +154,7 @@ int cmd_multi_pack_index(int argc, const char **argv,git_config (git_default_config,NULL ); -if (isatty (2 )) +if (isatty (STDERR_FILENO )) opts.flags |=MIDX_PROGRESS ; argc = parse_options(argc, argv, prefix, builtin_multi_pack_index_options,builtin/pack-objects.c +1
-1@@ -4016,7 +4016,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)if (git_env_bool (GIT_TEST_WRITE_REV_INDEX ,0 )) pack_idx_opts.flags |=WRITE_REV ; - progress =isatty (2 ); + progress =isatty (STDERR_FILENO ); argc =parse_options (argc, argv, prefix, pack_objects_options, pack_usage,0 );builtin/pack-redundant.c +1
-1@@ -621,7 +621,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)/* ignore objects given on stdin */ llist_init (&ignore); -if (!isatty (0 )) { +if (!isatty (STDIN_FILENO )) {while (fgets (buf,sizeof (buf), stdin)) { oid =xmalloc (sizeof (*oid));if (get_oid_hex (buf, oid))builtin/prune-packed.c +1
-1@@ -9,7 +9,7 @@ static const char * const prune_packed_usage[] = {int cmd_prune_packed (int argc,const char **argv,const char *prefix) { -int opts =isatty (2 ) ?PRUNE_PACKED_VERBOSE :0 ; +int opts =isatty (STDERR_FILENO ) ?PRUNE_PACKED_VERBOSE :0 ;const struct option prune_packed_options[] = {OPT_BIT ('n' ,"dry-run" , &opts,N_ ("dry run" ),PRUNE_PACKED_DRY_RUN ),builtin/prune.c +1
-1@@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) }if (show_progress ==-1 ) - show_progress =isatty (2 ); + show_progress =isatty (STDERR_FILENO );if (exclude_promisor_objects) { fetch_if_missing =0 ; revs.exclude_promisor_objects =1 ;builtin/rebase.c +1
-1@@ -1745,7 +1745,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" ); -if (isatty (2 ) && options.flags &REBASE_NO_QUIET ) +if (isatty (STDERR_FILENO ) && options.flags &REBASE_NO_QUIET )strbuf_addstr (&options.git_format_patch_opt," --progress" );if (options.git_am_opts.nr || options.type ==REBASE_APPLY ) {builtin/repack.c +1
-1@@ -710,7 +710,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) }strbuf_release (&buf); } -if (!po_args.quiet &&isatty (2 )) +if (!po_args.quiet &&isatty (STDERR_FILENO )) opts |=PRUNE_PACKED_VERBOSE ;prune_packed_objects (opts);builtin/send-pack.c +1
-1@@ -261,7 +261,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) }if (progress ==-1 ) - progress = !args.quiet &&isatty (2 ); + progress = !args.quiet &&isatty (STDERR_FILENO ); args.progress = progress;if (args.stateless_rpc) {builtin/shortlog.c +2
-2@@ -406,10 +406,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)string_list_sort (&log.trailers);/* assume HEAD if from a tty */ -if (!nongit && !rev.pending.nr &&isatty (0 )) +if (!nongit && !rev.pending.nr &&isatty (STDIN_FILENO ))add_head_to_pending (&rev);if (rev.pending.nr ==0 ) { -if (isatty (0 )) +if (isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));read_from_stdin (&log); }builtin/sparse-checkout.c +1
-1@@ -114,7 +114,7 @@ static int update_working_directory(struct pattern_list *pl) r->index->sparse_checkout_patterns = pl;memset (&o,0 ,sizeof (o)); - o.verbose_update =isatty (2 ); + o.verbose_update =isatty (STDERR_FILENO ); o.update =1 ; o.head_idx =-1 ; o.src_index = r->index;builtin/unpack-objects.c +1
-1@@ -522,7 +522,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)git_config (git_default_config,NULL ); - quiet = !isatty (2 ); + quiet = !isatty (STDERR_FILENO );for (i =1 ; i < argc; i++) {const char *arg = argv[i];column.c +1
-1@@ -211,7 +211,7 @@ int finalize_colopts(unsigned int *colopts, int stdout_is_tty) {if ((*colopts &COL_ENABLE_MASK ) ==COL_AUTO ) {if (stdout_is_tty <0 ) - stdout_is_tty =isatty (1 ); + stdout_is_tty =isatty (STDOUT_FILENO ); *colopts &= ~COL_ENABLE_MASK ;if (stdout_is_tty ||pager_in_use ()) *colopts |=COL_ENABLED ;date.c +1
-1@@ -969,7 +969,7 @@ void parse_date_format(const char *format, struct date_mode *mode)/* "auto:foo" is "if tty/pager, then foo, otherwise normal" */ if (skip_prefix (format,"auto:" , &p)) { -if (isatty (1 ) ||pager_in_use ()) +if (isatty (STDOUT_FILENO ) ||pager_in_use ()) format = p;else format ="default" ;editor.c +1
-1@@ -58,7 +58,7 @@ static int launch_specified_editor(const char *editor, const char *path,const char *args[] = { editor,NULL ,NULL };struct child_process p =CHILD_PROCESS_INIT ;int ret, sig; -int print_waiting_for_editor = advice_waiting_for_editor &&isatty (2 ); +int print_waiting_for_editor = advice_waiting_for_editor &&isatty (STDERR_FILENO );if (print_waiting_for_editor) {/* pager.c +2
-2@@ -101,7 +101,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)void setup_pager (void ) { -const char *pager =git_pager (isatty (1 )); +const char *pager =git_pager (isatty (STDOUT_FILENO ));if (!pager)return ;@@ -128,7 +128,7 @@ void setup_pager(void)/* original process continues, but writes to the pipe */ dup2 (pager_process.in,1 ); -if (isatty (2 )) +if (isatty (STDERR_FILENO ))dup2 (pager_process.in,2 );close (pager_process.in);preload-index.c +1
-1@@ -121,7 +121,7 @@ void preload_index(struct index_state *index,memset (&data,0 ,sizeof (data));memset (&pd,0 ,sizeof (pd)); -if (refresh_flags &REFRESH_PROGRESS &&isatty (2 )) { +if (refresh_flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) { pd.progress =start_delayed_progress (_ ("Refreshing index" ), index->cache_nr);pthread_mutex_init (&pd.mutex,NULL ); }read-cache.c +1
-1@@ -1568,7 +1568,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,int t2_sum_lstat =0 ;int t2_sum_scan =0 ; -if (flags &REFRESH_PROGRESS &&isatty (2 )) +if (flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) progress =start_delayed_progress (_ ("Refresh index" ), istate->cache_nr);remote-curl.c +1
-1@@ -1483,7 +1483,7 @@ int cmd_main(int argc, const char **argv) } options.verbosity =1 ; - options.progress = !!isatty (2 ); + options.progress = !!isatty (STDERR_FILENO ); options.thin =1 ;string_list_init (&options.deepen_not,1 );string_list_init (&options.push_options,1 );sequencer.c +2
-2@@ -2040,7 +2040,7 @@ static int should_edit(struct replay_opts *opts) {* commits; continue_single_pick() handles the conflicted * commits itself instead of calling this function. */ -return (opts->action ==REPLAY_REVERT &&isatty (0 )) ?1 :0 ; +return (opts->action ==REPLAY_REVERT &&isatty (STDIN_FILENO )) ?1 :0 ;return opts->edit; }@@ -4589,7 +4589,7 @@ static int continue_single_pick(struct repository *r, struct replay_opts *opts)* we want to edit if the user asked for it, or if they didn't specify * and stdin is a tty. */ -if (!opts->edit || (opts->edit <0 && !isatty (0 ))) +if (!opts->edit || (opts->edit <0 && !isatty (STDIN_FILENO )))/* * Include --cleanup=strip as well because we don't want the * "# Conflicts:" messages. sideband.c +1
-1@@ -126,7 +126,7 @@ int demultiplex_sideband(const char *me, int status,int band;if (!suffix) { -if (isatty (2 ) && !is_terminal_dumb ()) +if (isatty (STDERR_FILENO ) && !is_terminal_dumb ()) suffix =ANSI_SUFFIX ;else suffix =DUMB_SUFFIX ;transport.c +3
-3@@ -1051,7 +1051,7 @@ struct transport *transport_get(struct remote *remote, const char *url)const char *helper;struct transport *ret =xcalloc (1 ,sizeof (*ret)); - ret->progress =isatty (2 ); + ret->progress =isatty (STDERR_FILENO );string_list_init (&ret->pack_lockfiles,1 );if (!remote)@@ -1168,12 +1168,12 @@ void transport_set_verbosity(struct transport *transport, int verbosity,* . Report progress, if force_progress is 1 (ie. --progress). * . Don't report progress, if force_progress is 0 (ie. --no-progress). * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). -* . Report progress if isatty(2) is 1. +* . Report progress if isatty(STDERR_FILENO) is 1. **/ if (force_progress >=0 ) transport->progress = !!force_progress;else - transport->progress = verbosity >=0 &&isatty (2 ); + transport->progress = verbosity >=0 &&isatty (STDERR_FILENO ); }static void die_with_unpushed_submodules (struct string_list *needs_pushing)transport.h +1
-1@@ -110,7 +110,7 @@ struct transport { signed verbose : 3;/** * Transports should not set this directly, and should use this -* value without having to check isatty(2), -q/--quiet +* value without having to check isatty(STDERR_FILENO), -q/--quiet * (transport->verbose < 0), etc. - checking has already been done * in transport_set_verbosity(). **/
PATCH 2/3 Allow isatty to be overriden with GIT_FORCE_TTY
In reply to Avishay MatayevThere are several behaviors where git will not attempt to do an action if a tty is not present, for example - git_pager (pager.c) will instruct git to not use the GIT_PAGER environment variable if stdout is not a pty.
This makes sense for the normal command-line use case, however, we might want to force git to use GIT_PAGER as a pager even if no pty is present. This can be useful for an external program to know whether git has used the pager (as some commands in git do use the pager and some don't).
Another example is git push not prompting the editor to edit the commit message if no pty is present, which is a behavior Fugitive could use (even though it does not guarantee a pty).
--- builtin/am.c | 2 +- builtin/bisect--helper.c | 4 ++-- builtin/blame.c | 2 +- builtin/bundle.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- cache.h | 3 +++ color.c | 2 +- column.c | 2 +- compat/mingw.c | 6 +++--- compat/mingw.h | 2 +- compat/winansi.c | 16 ++++++++-------- config.c | 5 +++++ date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- transport.c | 6 +++--- transport.h | 2 +- wt-status.c | 2 +- 40 files changed, 63 insertions(+), 55 deletions(-)
builtin/am.c +1 -1
@@ -2394,7 +2394,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)* intend to feed us a patch but wanted to continue * unattended. */ -if (argc || (resume.mode ==RESUME_FALSE && !isatty (STDIN_FILENO ))) +if (argc || (resume.mode ==RESUME_FALSE && !git_isatty (STDIN_FILENO )))die (_ ("previous rebase directory %s still exists but mbox given." ), state.dir);
builtin/bisect--helper.c +2 -2
@@ -346,7 +346,7 @@ static int decide_next(const struct bisect_terms *terms,* although this is less optimum. */ warning (_ ("bisecting only with a %s commit" ), terms->term_bad); -if (!isatty (STDIN_FILENO )) +if (!git_isatty (STDIN_FILENO ))return 0 ;/* * TRANSLATORS: Make sure to include [Y] and [n] in your
@@ -813,7 +813,7 @@ static int bisect_autostart(struct bisect_terms *terms)fprintf_ln (stderr,_ ("You need to start by \"git bisect " "start\"\n" )); -if (!isatty (STDIN_FILENO )) +if (!git_isatty (STDIN_FILENO ))return -1 ;/*
builtin/blame.c +1 -1
@@ -945,7 +945,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)die (_ ("--progress can't be used with --incremental or porcelain formats" )); show_progress =0 ; }else if (show_progress <0 ) - show_progress =isatty (STDERR_FILENO ); + show_progress =git_isatty (STDERR_FILENO );if (0 < abbrev && abbrev < hexsz)/* one more abbrev length is needed for the boundary commit */
builtin/bundle.c +1 -1
@@ -58,7 +58,7 @@ static int parse_options_cmd_bundle(int argc,static int cmd_bundle_create (int argc,const char **argv,const char *prefix) {int all_progress_implied =0 ; -int progress =isatty (STDERR_FILENO ); +int progress =git_isatty (STDERR_FILENO );struct strvec pack_opts;int version =-1 ;
builtin/checkout.c +1 -1
@@ -1607,7 +1607,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,if (opts->quiet) opts->show_progress =0 ;else - opts->show_progress =isatty (STDERR_FILENO ); + opts->show_progress =git_isatty (STDERR_FILENO ); }if (opts->conflict_style) {
builtin/commit-graph.c +2 -2
@@ -87,7 +87,7 @@ static int graph_verify(int argc, const char **argv)trace2_cmd_mode ("verify" ); - opts.progress =isatty (STDERR_FILENO ); + opts.progress =git_isatty (STDERR_FILENO ); argc =parse_options (argc, argv,NULL , builtin_commit_graph_verify_options, builtin_commit_graph_verify_usage,0 );
@@ -236,7 +236,7 @@ static int graph_write(int argc, const char **argv) OPT_END(), }; - opts.progress =isatty (STDERR_FILENO ); + opts.progress =git_isatty (STDERR_FILENO ); opts.enable_changed_paths =-1 ; write_opts.size_multiple =2 ; write_opts.max_commits =0 ;
builtin/commit.c +1 -1
@@ -754,7 +754,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,strbuf_addbuf (&sb, &message); hook_arg1 ="message" ; }else if (logfile && !strcmp (logfile,"-" )) { -if (isatty (STDIN_FILENO )) +if (git_isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));if (strbuf_read (&sb,0 ,0 ) <0 )die_errno (_ ("could not read log from standard input" ));
builtin/fsck.c +1 -1
@@ -790,7 +790,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_obj_options.strict =1 ;if (show_progress ==-1 ) - show_progress =isatty (STDERR_FILENO ); + show_progress =git_isatty (STDERR_FILENO );if (verbose) show_progress =0 ;
builtin/gc.c +1 -1
@@ -1425,7 +1425,7 @@ static int maintenance_run(int argc, const char **argv, const char *prefix) };memset (&opts,0 ,sizeof (opts)); - opts.quiet = !isatty (STDERR_FILENO ); + opts.quiet = !git_isatty (STDERR_FILENO );for (i =0 ; i <TASK__COUNT ; i++) tasks[i].selected_order =-1 ;
builtin/log.c +1 -1
@@ -69,7 +69,7 @@ struct line_opt_callback_data {static int session_is_interactive (void ) { -return isatty (STDOUT_FILENO ) ||pager_in_use (); +return git_isatty (STDOUT_FILENO ) ||pager_in_use (); }static int auto_decoration_style (void )
builtin/merge.c +2 -2
@@ -734,7 +734,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, o.subtree_shift ="" ; o.show_rename_progress = - show_progress ==-1 ?isatty (STDERR_FILENO ) : show_progress; + show_progress ==-1 ?git_isatty (STDERR_FILENO ) : show_progress;for (x =0 ; x < xopts_nr; x++)if (parse_merge_opt (&o, xopts[x]))
@@ -1073,7 +1073,7 @@ static int default_edit_option(void)/* Use editor if stdin and stdout are the same and is a tty */ return (!fstat (0 , &st_stdin) && !fstat (1 , &st_stdout) && -isatty (STDIN_FILENO ) &&isatty (STDOUT_FILENO ) && +git_isatty (STDIN_FILENO ) &&git_isatty (STDOUT_FILENO ) && st_stdin.st_dev == st_stdout.st_dev && st_stdin.st_ino == st_stdout.st_ino && st_stdin.st_mode == st_stdout.st_mode);
builtin/multi-pack-index.c +1 -1
@@ -154,7 +154,7 @@ int cmd_multi_pack_index(int argc, const char **argv,git_config (git_default_config,NULL ); -if (isatty (STDERR_FILENO )) +if (git_isatty (STDERR_FILENO )) opts.flags |=MIDX_PROGRESS ; argc = parse_options(argc, argv, prefix, builtin_multi_pack_index_options,
builtin/pack-objects.c +1 -1
@@ -4016,7 +4016,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)if (git_env_bool (GIT_TEST_WRITE_REV_INDEX ,0 )) pack_idx_opts.flags |=WRITE_REV ; - progress =isatty (STDERR_FILENO ); + progress =git_isatty (STDERR_FILENO ); argc =parse_options (argc, argv, prefix, pack_objects_options, pack_usage,0 );
builtin/pack-redundant.c +1 -1
@@ -621,7 +621,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)/* ignore objects given on stdin */ llist_init (&ignore); -if (!isatty (STDIN_FILENO )) { +if (!git_isatty (STDIN_FILENO )) {while (fgets (buf,sizeof (buf), stdin)) { oid =xmalloc (sizeof (*oid));if (get_oid_hex (buf, oid))
builtin/prune-packed.c +1 -1
@@ -9,7 +9,7 @@ static const char * const prune_packed_usage[] = {int cmd_prune_packed (int argc,const char **argv,const char *prefix) { -int opts =isatty (STDERR_FILENO ) ?PRUNE_PACKED_VERBOSE :0 ; +int opts =git_isatty (STDERR_FILENO ) ?PRUNE_PACKED_VERBOSE :0 ;const struct option prune_packed_options[] = {OPT_BIT ('n' ,"dry-run" , &opts,N_ ("dry run" ),PRUNE_PACKED_DRY_RUN ),
builtin/prune.c +1 -1
@@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) }if (show_progress ==-1 ) - show_progress =isatty (STDERR_FILENO ); + show_progress =git_isatty (STDERR_FILENO );if (exclude_promisor_objects) { fetch_if_missing =0 ; revs.exclude_promisor_objects =1 ;
builtin/rebase.c +1 -1
@@ -1745,7 +1745,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)if (options.root && !options.onto_name)imply_merge (&options,"--root without --onto" ); -if (isatty (STDERR_FILENO ) && options.flags &REBASE_NO_QUIET ) +if (git_isatty (STDERR_FILENO ) && options.flags &REBASE_NO_QUIET )strbuf_addstr (&options.git_format_patch_opt," --progress" );if (options.git_am_opts.nr || options.type ==REBASE_APPLY ) {
builtin/repack.c +1 -1
@@ -710,7 +710,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) }strbuf_release (&buf); } -if (!po_args.quiet &&isatty (STDERR_FILENO )) +if (!po_args.quiet &&git_isatty (STDERR_FILENO )) opts |=PRUNE_PACKED_VERBOSE ;prune_packed_objects (opts);
builtin/send-pack.c +1 -1
@@ -261,7 +261,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) }if (progress ==-1 ) - progress = !args.quiet &&isatty (STDERR_FILENO ); + progress = !args.quiet &&git_isatty (STDERR_FILENO ); args.progress = progress;if (args.stateless_rpc) {
builtin/shortlog.c +2 -2
@@ -406,10 +406,10 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)string_list_sort (&log.trailers);/* assume HEAD if from a tty */ -if (!nongit && !rev.pending.nr &&isatty (STDIN_FILENO )) +if (!nongit && !rev.pending.nr &&git_isatty (STDIN_FILENO ))add_head_to_pending (&rev);if (rev.pending.nr ==0 ) { -if (isatty (STDIN_FILENO )) +if (git_isatty (STDIN_FILENO ))fprintf (stderr,_ ("(reading log message from standard input)\n" ));read_from_stdin (&log); }
builtin/sparse-checkout.c +1 -1
@@ -114,7 +114,7 @@ static int update_working_directory(struct pattern_list *pl) r->index->sparse_checkout_patterns = pl;memset (&o,0 ,sizeof (o)); - o.verbose_update =isatty (STDERR_FILENO ); + o.verbose_update =git_isatty (STDERR_FILENO ); o.update =1 ; o.head_idx =-1 ; o.src_index = r->index;
builtin/unpack-objects.c +1 -1
@@ -522,7 +522,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)git_config (git_default_config,NULL ); - quiet = !isatty (STDERR_FILENO ); + quiet = !git_isatty (STDERR_FILENO );for (i =1 ; i < argc; i++) {const char *arg = argv[i];
cache.h +3 -0
@@ -1893,4 +1893,7 @@ int print_sha1_ellipsis(void);/* Return 1 if the file is empty or does not exists, 0 otherwise. */ int is_empty_or_missing_file (const char *filename); +/* Return 1 if the fd is a tty or if GIT_FORCE_TTY is set, 0 otherwise. */ +int git_isatty (int fd); +#endif /* CACHE_H */
color.c +1 -1
@@ -357,7 +357,7 @@ static int check_auto_color(int fd)static int color_stderr_is_tty =-1 ;int *is_tty_p = fd ==1 ? &color_stdout_is_tty : &color_stderr_is_tty;if (*is_tty_p <0 ) - *is_tty_p =isatty (fd); + *is_tty_p =git_isatty (fd);if (*is_tty_p || (fd ==1 &&pager_in_use () && pager_use_color)) {if (!is_terminal_dumb ())return 1 ;
column.c +1 -1
@@ -211,7 +211,7 @@ int finalize_colopts(unsigned int *colopts, int stdout_is_tty) {if ((*colopts &COL_ENABLE_MASK ) ==COL_AUTO ) {if (stdout_is_tty <0 ) - stdout_is_tty =isatty (STDOUT_FILENO ); + stdout_is_tty =git_isatty (STDOUT_FILENO ); *colopts &= ~COL_ENABLE_MASK ;if (stdout_is_tty ||pager_in_use ()) *colopts |=COL_ENABLED ;
compat/mingw.c +3 -3
@@ -204,7 +204,7 @@ static int ask_yes_no_if_possible(const char *format, ...)return !run_command_v_opt (retry_hook,0 ); } -if (!isatty (_fileno (stdin)) || !isatty (_fileno (stderr))) +if (!git_isatty (_fileno (stdin)) || !git_isatty (_fileno (stderr)))return 0 ;while (1 ) {
@@ -570,7 +570,7 @@ static BOOL WINAPI ctrl_ignore(DWORD type)int mingw_fgetc (FILE *stream) {int ch; -if (!isatty (_fileno (stream))) +if (!git_isatty (_fileno (stream)))return fgetc (stream);SetConsoleCtrlHandler (ctrl_ignore, TRUE);
@@ -2353,7 +2353,7 @@ int mingw_raise(int sig)switch (sig) {case SIGALRM :if (timer_fn ==SIG_DFL ) { -if (isatty (STDERR_FILENO )) +if (git_isatty (STDERR_FILENO ))fputs ("Alarm clock\n" , stderr);exit (128 +SIGALRM ); }else if (timer_fn !=SIG_IGN )
compat/mingw.h +1 -1
@@ -425,7 +425,7 @@ int mingw_raise(int sig);*/ int winansi_isatty (int fd); -#define isatty winansi_isatty +#define git_isatty winansi_isattyint winansi_dup2 (int oldfd,int newfd);#define dup2 winansi_dup2
compat/winansi.c +8 -8
@@ -590,19 +590,19 @@ static void detect_msys_tty(int fd)#endif /* -* Wrapper for isatty(). Most calls in the main git code -* call isatty(1 or 2) to see if the instance is interactive -* and should: be colored, show progress, paginate output. -* We lie and give results for what the descriptor WAS at -* startup (and ignore any pipe redirection we internally -* do). +* Wrapper for git_isatty(). Most calls in the main git +* code call git_isatty(1 or 2) to see if the instance is +* interactive and should: be colored, show progress, +* paginate output. We lie and give results for what the +* descriptor WAS at startup (and ignore any pipe +* redirection we internally do). */ -#undef isatty +#undef git_isattyint winansi_isatty (int fd) {if (fd >=0 && fd <=2 )return fd_is_interactive[fd] !=0 ; -return isatty (fd); +return git_isatty (fd); }void winansi_init (void )
config.c +5 -0
@@ -3563,3 +3563,8 @@ int lookup_config(const char **mapping, int nr_mapping, const char *var) }return -1 ; } + +int git_isatty (int fd) +{ +return git_env_bool ("GIT_FORCE_TTY" ,isatty (fd)); +}
date.c +1 -1
@@ -969,7 +969,7 @@ void parse_date_format(const char *format, struct date_mode *mode)/* "auto:foo" is "if tty/pager, then foo, otherwise normal" */ if (skip_prefix (format,"auto:" , &p)) { -if (isatty (STDOUT_FILENO ) ||pager_in_use ()) +if (git_isatty (STDOUT_FILENO ) ||pager_in_use ()) format = p;else format ="default" ;
editor.c +1 -1
@@ -58,7 +58,7 @@ static int launch_specified_editor(const char *editor, const char *path,const char *args[] = { editor,NULL ,NULL };struct child_process p =CHILD_PROCESS_INIT ;int ret, sig; -int print_waiting_for_editor = advice_waiting_for_editor &&isatty (STDERR_FILENO ); +int print_waiting_for_editor = advice_waiting_for_editor &&git_isatty (STDERR_FILENO );if (print_waiting_for_editor) {/*
pager.c +2 -2
@@ -101,7 +101,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager)void setup_pager (void ) { -const char *pager =git_pager (isatty (STDOUT_FILENO )); +const char *pager =git_pager (git_isatty (STDOUT_FILENO ));if (!pager)return ;
@@ -128,7 +128,7 @@ void setup_pager(void)/* original process continues, but writes to the pipe */ dup2 (pager_process.in,1 ); -if (isatty (STDERR_FILENO )) +if (git_isatty (STDERR_FILENO ))dup2 (pager_process.in,2 );close (pager_process.in);
preload-index.c +1 -1
@@ -121,7 +121,7 @@ void preload_index(struct index_state *index,memset (&data,0 ,sizeof (data));memset (&pd,0 ,sizeof (pd)); -if (refresh_flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) { +if (refresh_flags &REFRESH_PROGRESS &&git_isatty (STDERR_FILENO )) { pd.progress =start_delayed_progress (_ ("Refreshing index" ), index->cache_nr);pthread_mutex_init (&pd.mutex,NULL ); }
read-cache.c +1 -1
@@ -1568,7 +1568,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,int t2_sum_lstat =0 ;int t2_sum_scan =0 ; -if (flags &REFRESH_PROGRESS &&isatty (STDERR_FILENO )) +if (flags &REFRESH_PROGRESS &&git_isatty (STDERR_FILENO )) progress =start_delayed_progress (_ ("Refresh index" ), istate->cache_nr);
remote-curl.c +1 -1
@@ -1483,7 +1483,7 @@ int cmd_main(int argc, const char **argv) } options.verbosity =1 ; - options.progress = !!isatty (STDERR_FILENO ); + options.progress = !!git_isatty (STDERR_FILENO ); options.thin =1 ;string_list_init (&options.deepen_not,1 );string_list_init (&options.push_options,1 );
sequencer.c +2 -2
@@ -2040,7 +2040,7 @@ static int should_edit(struct replay_opts *opts) {* commits; continue_single_pick() handles the conflicted * commits itself instead of calling this function. */ -return (opts->action ==REPLAY_REVERT &&isatty (STDIN_FILENO )) ?1 :0 ; +return (opts->action ==REPLAY_REVERT &&git_isatty (STDIN_FILENO )) ?1 :0 ;return opts->edit; }
@@ -4589,7 +4589,7 @@ static int continue_single_pick(struct repository *r, struct replay_opts *opts)* we want to edit if the user asked for it, or if they didn't specify * and stdin is a tty. */ -if (!opts->edit || (opts->edit <0 && !isatty (STDIN_FILENO ))) +if (!opts->edit || (opts->edit <0 && !git_isatty (STDIN_FILENO )))/* * Include --cleanup=strip as well because we don't want the * "# Conflicts:" messages.
sideband.c +1 -1
@@ -126,7 +126,7 @@ int demultiplex_sideband(const char *me, int status,int band;if (!suffix) { -if (isatty (STDERR_FILENO ) && !is_terminal_dumb ()) +if (git_isatty (STDERR_FILENO ) && !is_terminal_dumb ()) suffix =ANSI_SUFFIX ;else suffix =DUMB_SUFFIX ;
transport.c +3 -3
@@ -1051,7 +1051,7 @@ struct transport *transport_get(struct remote *remote, const char *url)const char *helper;struct transport *ret =xcalloc (1 ,sizeof (*ret)); - ret->progress =isatty (STDERR_FILENO ); + ret->progress =git_isatty (STDERR_FILENO );string_list_init (&ret->pack_lockfiles,1 );if (!remote)
@@ -1168,12 +1168,12 @@ void transport_set_verbosity(struct transport *transport, int verbosity,* . Report progress, if force_progress is 1 (ie. --progress). * . Don't report progress, if force_progress is 0 (ie. --no-progress). * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). -* . Report progress if isatty(STDERR_FILENO) is 1. +* . Report progress if git_isatty(STDERR_FILENO) is 1. **/ if (force_progress >=0 ) transport->progress = !!force_progress;else - transport->progress = verbosity >=0 &&isatty (STDERR_FILENO ); + transport->progress = verbosity >=0 &&git_isatty (STDERR_FILENO ); }static void die_with_unpushed_submodules (struct string_list *needs_pushing)
transport.h +1 -1
@@ -110,7 +110,7 @@ struct transport { signed verbose : 3;/** * Transports should not set this directly, and should use this -* value without having to check isatty(STDERR_FILENO), -q/--quiet +* value without having to check git_isatty(STDERR_FILENO), -q/--quiet * (transport->verbose < 0), etc. - checking has already been done * in transport_set_verbosity(). **/
wt-status.c +1 -1
@@ -1060,7 +1060,7 @@ static void wt_longstatus_print_verbose(struct wt_status *s)* If we're not going to stdout, then we definitely don't * want color, since we are going to the commit message * file (and even the "auto" setting won't work, since it -* will have checked isatty on stdout). But we then do want +* will have checked git_isatty on stdout). But we then do want * to insert the scissor line here to reliably remove the * diff before committing. */
Signature · 1 line
2.25.1
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 3 lines · Avishay Matayev
There are several behaviors where git will not attempt to do an action if a tty is not present, for example -
git_pager(pager.c) will instruct git to not use theGIT_PAGERenvironment variable if stdout is not a pty.
In general, I am negative on this approach, even though I agree that the issue you are trying to solve is worth solving. "Force pretend that we are talking to a TTY" exposes too much of the internal logic in the implementation to the end users.
Often we use isatty() as an approximation for "are we being interactive?", and I wouldn't have as much problem as I have with the "FORCE_TTY" to an approach to give users a knob to tell us "do not use your logic to guess---I am telling you that we are interactive, so behave as such".
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 12 lines · Junio C Hamano
Quoted 3 lines · Avishay Matayev
There are several behaviors where git will not attempt to do an action if a tty is not present, for example -
git_pager(pager.c) will instruct git to not use theGIT_PAGERenvironment variable if stdout is not a pty.In general, I am negative on this approach, even though I agree that the issue you are trying to solve is worth solving. "Force pretend that we are talking to a TTY" exposes too much of the internal logic in the implementation to the end users.
Quoted 5 lines
Often we use
isatty()as an approximation for "are we being interactive?", and I wouldn't have as much problem as I have with the "FORCE_TTY" to an approach to give users a knob to tell us "do not use your logic to guess---I am telling you that we are interactive, so behave as such".
I'm not sure that I understand your view on this patch. git_isatty() does exactly that, it gives the users that knob, doesn't it?
If you don't find the approach in this patch good enough, what exactly do you suggest?
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 18 lines · Avishay Matayev
Quoted 12 lines · Junio C Hamano
Quoted 3 lines · Avishay Matayev
There are several behaviors where git will not attempt to do an action if a tty is not present, for example -
git_pager(pager.c) will instruct git to not use theGIT_PAGERenvironment variable if stdout is not a pty.In general, I am negative on this approach, even though I agree that the issue you are trying to solve is worth solving. "Force pretend that we are talking to a TTY" exposes too much of the internal logic in the implementation to the end users.
Quoted 5 lines
Often we use
isatty()as an approximation for "are we being interactive?", and I wouldn't have as much problem as I have with the "FORCE_TTY" to an approach to give users a knob to tell us "do not use your logic to guess---I am telling you that we are interactive, so behave as such".
Quoted 5 lines
I'm not sure that I understand your view on this patch.
git_isatty()does exactly that, it gives the users that knob, doesn't it?If you don't find the approach in this patch good enough, what exactly do you suggest?
Start with not tying this feature with the word "TTY", probably.
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 21 lines · Junio C Hamano
Quoted 18 lines · Avishay Matayev
Quoted 17 lines · Junio C Hamano
Quoted 3 lines · Avishay Matayev
There are several behaviors where git will not attempt to do an action if a tty is not present, for example -
git_pager(pager.c) will instruct git to not use theGIT_PAGERenvironment variable if stdout is not a pty.In general, I am negative on this approach, even though I agree that the issue you are trying to solve is worth solving. "Force pretend that we are talking to a TTY" exposes too much of the internal logic in the implementation to the end users.
Often we use
isatty()as an approximation for "are we being interactive?", and I wouldn't have as much problem as I have with the "FORCE_TTY" to an approach to give users a knob to tell us "do not use your logic to guess---I am telling you that we are interactive, so behave as such".
Quoted 7 lines
Quoted 5 lines
I'm not sure that I understand your view on this patch.
git_isatty()does exactly that, it gives the users that knob, doesn't it?If you don't find the approach in this patch good enough, what exactly do you suggest?
Start with not tying this feature with the word "TTY", probably.
Well then, what are other indicators of 'interactivity' besides "TTY"?
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 5 lines · Avishay Matayev
Quoted 4 lines
Quoted 2 lines
If you don't find the approach in this patch good enough, what exactly do you suggest?
Start with not tying this feature with the word "TTY", probably.
Well then, what are other indicators of 'interactivity' besides "TTY"?
If we want to force output to always go through the pager, we should call it "force pager", not "force tty". If we want to always show progress bar no matter where the output goes, we should call it "force progress", not "force tty". These should be controllable independenty, even though it is OK to have catch all "force everything" for convenience.
There is no inherent reason why the output has to be passed through the pager when it goes to tty. It merely is how we happen to have designed the heuristics. We don't want to carve it in stone and expose it on end-users with a poorly chosen name. Also, we do not want to tie multiple features unnecessarily.
Re: [PATCH 2/3] Allow isatty to be overriden with GIT_FORCE_TTY
Quoted 8 lines · Junio C Hamano
If we want to force output to always go through the pager, we should call it "force pager", not "force tty". If we want to always show progress bar no matter where the output goes, we should call it "force progress", not "force tty". These should be controllable independenty, even though it is OK to have catch all "force everything" for convenience.
But using "force pager" or "force progress" is exactly the same as acknowledging that git uses tty for the output, as you'd have to know that the pager wouldn't open because there is no tty. The original implementation should've been to implement just the "force pager" logic but we've realised there are more places where git acts in a different way because of tty and I don't really see a reason those should be controlled individually, it will just create too many variables when the reason for their existence is the same, the absence of a tty.
Quoted 5 lines
There is no inherent reason why the output has to be passed through the pager when it goes to tty. It merely is how we happen to have designed the heuristics. We don't want to carve it in stone and expose it on end-users with a poorly chosen name. Also, we do not want to tie multiple features unnecessarily.
I mean, git is pretty CLI centered, it isn't a library, so I'd say there is a pretty strong core reason for this design (at least that's how I see git). Unfortunately, when we want to use git in its not really CLI-like way, it acts unexpectedly.
Moreover, I really don't think this feature is intended for the regular git user,
it will mostly help Fugitive or other programs that are built upon git's core, and those are most likely have to be familiar with git's implementation in one way or another.
Avishay
PATCH 3/3 Add tests for GIT_FORCE_TTY
In reply to Avishay Matayev--- t/t9904-git-force-tty.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 t/t9904-git-force-tty.sh
t/t9904-git-force-tty.sh new file +38 -0
@@ -0,0 +1,38 @@ +#!/bin/sh + +test_description='Test GIT_FORCE_TTY' + +. ./test-lib.sh + +test_expect_success 'setup' ' + echo test_data > test_file && + git add test_file && + git commit -m first +' + +test_expect_success 'no output without force' ' + GIT_FORCE_TTY=0 GIT_PAGER="cat - > log_data" git log > /dev/null && + test ! -f log_data +' + +test_expect_success 'output with force' ' + GIT_FORCE_TTY=1 GIT_PAGER="cat - > log_data2" git log > /dev/null && + test -f log_data2 +' + +test_expect_success 'cant tell pager present in git reflog without force' ' + GIT_FORCE_TTY=false PAGER="touch pager2" git reflog > /dev/null && + test ! -f pager2 +' + +test_expect_success 'pager present in git reflog' ' + GIT_FORCE_TTY=yes PAGER="touch pager" git reflog > /dev/null && + test -f pager +' + +test_expect_success 'pager not present in git reflog expire' ' + GIT_FORCE_TTY=true PAGER="touch pager3" git reflog expire > /dev/null && + test ! -f pager3 +' + +test_done
Signature · 1 line
2.25.1
Quoted 72 lines · Avishay Matayev
This is the resulting patch series from the discussion in the mailing list[1] and the Fugitive github issue[2].
The goal is to allow to override git decisiveness about not doing something when some fd is not a pty, which can hinder Fugitive.
I didn't annotate the location of the commits as I wasn't sure what was the correct one.. As it is not specific to a single mechanisms, but rather it is something global, is it fine as it is or should I use something as
global,tree:ortree-wide:`?I also didn't document this feature, or at least I wasn't sure where to document it (other than on these commits), I would compare it to the
GIT_SMART_HTTPas it is something pretty niche and it isn't (and IMO shouldn't be) documented to the regular user.Thank you,
Avishay1. https://lore.kernel.org/git/CAJ-0OswsrnAuCwU6U=S2i1qKkg=66U-8RHSGqD2kh9T_30Yw9w@mail.gmail.com/
2. https://github.com/tpope/vim-fugitive/issues/1772Avishay Matayev (3):
Change isatty's parameter to a*_FILENOdefine
Allow isatty to be overriden withGIT_FORCE_TTY
Add tests forGIT_FORCE_TTYbuiltin/am.c | 2 +- builtin/bisect--helper.c | 4 ++-- builtin/blame.c | 2 +- builtin/bundle.c | 2 +- builtin/checkout.c | 2 +- builtin/commit-graph.c | 4 ++-- builtin/commit.c | 2 +- builtin/fsck.c | 2 +- builtin/gc.c | 2 +- builtin/log.c | 2 +- builtin/merge.c | 4 ++-- builtin/multi-pack-index.c | 2 +- builtin/pack-objects.c | 2 +- builtin/pack-redundant.c | 2 +- builtin/prune-packed.c | 2 +- builtin/prune.c | 2 +- builtin/rebase.c | 2 +- builtin/repack.c | 2 +- builtin/send-pack.c | 2 +- builtin/shortlog.c | 4 ++-- builtin/sparse-checkout.c | 2 +- builtin/unpack-objects.c | 2 +- cache.h | 3 +++ color.c | 2 +- column.c | 2 +- compat/mingw.c | 6 +++--- compat/mingw.h | 2 +- compat/winansi.c | 16 ++++++++-------- config.c | 5 +++++ date.c | 2 +- editor.c | 2 +- pager.c | 4 ++-- preload-index.c | 2 +- read-cache.c | 2 +- remote-curl.c | 2 +- sequencer.c | 4 ++-- sideband.c | 2 +- t/t9904-git-force-tty.sh | 38 ++++++++++++++++++++++++++++++++++++++ transport.c | 6 +++--- transport.h | 2 +- wt-status.c | 2 +- 41 files changed, 101 insertions(+), 55 deletions(-) create mode 100755 t/t9904-git-force-tty.sh
Quoted 3 lines
--
2.25.1
Bumping this thread, I'll appreciate any constructive feedback.