From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B63631F466 for ; Thu, 16 Jan 2020 06:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730200AbgAPGOn (ORCPT ); Thu, 16 Jan 2020 01:14:43 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38744 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730150AbgAPGOm (ORCPT ); Thu, 16 Jan 2020 01:14:42 -0500 Received: by mail-wm1-f68.google.com with SMTP id u2so2453332wmc.3 for ; Wed, 15 Jan 2020 22:14:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Uhvq/tRiZUZZT7d8LySc39EPQy3kuTme2ovgjshC0Bs=; b=AL8xAQHKm4ZFUCvbJLhPF0PUd+vNwqg51gmGObnC1E8VxFE2Jv6yneRRA9oAf665yL vWcszCJrXFEy5RSw0NW6dnjersTFSyaPhZWH05ThUZvdg9hsqCbt5Er0Jdc9ixkiICWU ttAKlyaRPkjvCpziBmqmn9H4mjCJxb9WlodATmnDgbSQtiJ1kPz2vYOujvDInlzH6YgC kSGlSmY00WcnzjA4fftqeXtK2TFbt3RgCOKaFvvqk2uacZ7Pd1dnHzwJ+sPpgiAolnZY 6Epnj9TzlF1vEXwI+k3BWyl7qT/1FiQ89MoWnwbjEgBVkhd+2+wbxF+3iUFfSehVPAmn OyIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Uhvq/tRiZUZZT7d8LySc39EPQy3kuTme2ovgjshC0Bs=; b=ENs6JrubyBhru+hl0DOvoPbOkM/x9RtdIo7caCNf+WJl7puKv415jUltwYqN7lKs2L granJy9KWcvOBM8kFZqMf5r1R2OrgDHXCvI4mp27mRF3I2WznM1b/U8kWe6P6dWAxY5k IMtDS7oyUcCDChUqn9bO8loTUsprTzN7TZFwMWIPspzR8pGmcSCIBuLTdqL1uLA1Ytca 8FjMIAXGe+6nbK8WtZlaxu9uo3CL1FILBifZL6CydrHFTeQXV3Pn0NhG+1MQFWiSgWtD 8uVyMhAv7PBcApVHj2tPkvKOloc4GmSKhBnS35at018jnQ2mT0ibRbK3WxnkOx50D6KZ RHFw== X-Gm-Message-State: APjAAAW6bnuNeurcynVVEwtELVdModyBG+rtH6zqmr5pbCXu4AqD0kus KTNTBSK1a8x8P5mFLxmwY1rwR67g X-Google-Smtp-Source: APXvYqy1/OXcD6cTIixykP6rn1JDtdL491gR6qFtZv7sHVG7RoFtebToWDKm9lMZduwLlgQvmae9DA== X-Received: by 2002:a7b:cb0d:: with SMTP id u13mr4367946wmj.68.1579155280022; Wed, 15 Jan 2020 22:14:40 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i5sm28345171wrv.34.2020.01.15.22.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 22:14:39 -0800 (PST) Message-Id: <8d731fa39c3c51cf33e1e105e756d2bf34a8f9a7.1579155273.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Thu, 16 Jan 2020 06:14:20 +0000 Subject: [PATCH v4 06/19] rebase, sequencer: remove the broken GIT_QUIET handling Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk, liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com, alban.gruin@gmail.com, szeder.dev@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren The GIT_QUIET environment variable was used to signal the non-am backends that the rebase should perform quietly. The preserve-merges backend does not make use of the quiet flag anywhere (other than to write out its state whenever it writes state), and this mechanism was broken in the conversion from shell to C. Since this environment variable was specifically designed for scripts and the only backend that would still use it is no longer a script, just gut this code. A subsequent commit will fix --quiet for the interactive/merge backend in a different way. Signed-off-by: Elijah Newren --- builtin/rebase.c | 6 ++---- sequencer.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index c299869e7b..57875485df 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -699,8 +699,8 @@ static int rebase_write_basic_state(struct rebase_options *opts) opts->onto ? oid_to_hex(&opts->onto->object.oid) : ""); write_file(state_dir_path("orig-head", opts), "%s", oid_to_hex(&opts->orig_head)); - write_file(state_dir_path("quiet", opts), "%s", - opts->flags & REBASE_NO_QUIET ? "" : "t"); + if (!(opts->flags & REBASE_NO_QUIET)) + write_file(state_dir_path("quiet", opts), "%s", ""); if (opts->flags & REBASE_VERBOSE) write_file(state_dir_path("verbose", opts), "%s", ""); if (opts->strategy) @@ -1153,8 +1153,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) add_var(&script_snippet, "revisions", opts->revisions); add_var(&script_snippet, "restrict_revision", opts->restrict_revision ? oid_to_hex(&opts->restrict_revision->object.oid) : NULL); - add_var(&script_snippet, "GIT_QUIET", - opts->flags & REBASE_NO_QUIET ? "" : "t"); sq_quote_argv_pretty(&buf, opts->git_am_opts.argv); add_var(&script_snippet, "git_am_opt", buf.buf); strbuf_release(&buf); diff --git a/sequencer.c b/sequencer.c index 354d0b5a38..078a68eaf3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2568,8 +2568,6 @@ static void write_strategy_opts(struct replay_opts *opts) int write_basic_state(struct replay_opts *opts, const char *head_name, struct commit *onto, const char *orig_head) { - const char *quiet = getenv("GIT_QUIET"); - if (head_name) write_file(rebase_path_head_name(), "%s\n", head_name); if (onto) @@ -2578,8 +2576,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name, if (orig_head) write_file(rebase_path_orig_head(), "%s\n", orig_head); - if (quiet) - write_file(rebase_path_quiet(), "%s\n", quiet); + if (opts->quiet) + write_file(rebase_path_quiet(), "%s", ""); if (opts->verbose) write_file(rebase_path_verbose(), "%s", ""); if (opts->strategy) -- gitgitgadget