From patchwork Tue Feb 25 10:55:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11403227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DA4817D5 for ; Tue, 25 Feb 2020 10:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D152218AC for ; Tue, 25 Feb 2020 10:55:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oelhYgVn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729786AbgBYKzr (ORCPT ); Tue, 25 Feb 2020 05:55:47 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41924 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729193AbgBYKzr (ORCPT ); Tue, 25 Feb 2020 05:55:47 -0500 Received: by mail-wr1-f66.google.com with SMTP id v4so1296602wrs.8 for ; Tue, 25 Feb 2020 02:55:44 -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=lolcPEH9dhf4EWrJllSyFaba3lqKmwgtdjkj9k8UdV0=; b=oelhYgVnjTx9B2aRgVbxmyi4tCqgtu2bB0WppD1+4gV5+ZcOfVsYzHTGIAiv7ubsnB RnBFOe7e054lwMmX6YtUJYqP6MYsg23+m4EKZ7pUZbso75OdsdsYmx+s7Xy5p9JVFppC fG37wRWvldvMVq5JF2YrZOZ+p+Mx120/sefuFqMbNg2dmt1fZUJMD8ENPQzkF7mFTNg9 K+Q9o91ESDzGHMrmAlDLTtYn/Z4Wg1m9h9QyXlmh0j/ADr4rCTB0F4ef52Qa5O7nNh47 gKHJKlkrBSMzDrL7JVTEBx3UOJUNmGpdq+THg3cqm6ng6HxjlAb+G4lYVFTcUW10SW87 3P0Q== 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=lolcPEH9dhf4EWrJllSyFaba3lqKmwgtdjkj9k8UdV0=; b=H+sfPuZIwID1iGmoRtqUYGSVP4IbZ1s7ly7E6L7piEcUBcjAXCwzYchPwYxzY95krk 1SC0T2wnsSp7RAjpmw6uLVyDq5ts6cAbsXMdrD4YE2VCgJTmtOJJqunOBchmYRxplEui R5yYEtofjtFKsRiyVEsZ6vkBSYYS9BuIDz+woV+7BxOMTkd1+mrVjx1vmU2sH9kQCtdq YLXm5PUkzRjGVkl0JbK7jFkWN4zH8cQojYM6sOKOJqcK0QwGeIP/r/c7IJ+0n7psAhHQ BV7AFhuW406hfdV54jvpTtxLuKP8LSs3yPoN023S0S33yedgmlnD4KOLIpfbofk6gGT4 mvzw== X-Gm-Message-State: APjAAAUvW4LmxXmFo1Sa7PL8OzsaT2PrSBtuoloOPdIJfGxdYtITLNvg GQJ/jPxRrC3NqBZwAeAsxgjM2D22 X-Google-Smtp-Source: APXvYqxa6QFlJzAgxBiqQ6Z3d2sIY0GUTYhDBbg8f+bz5XK6vYNoY7LdVN/qe2PzkFSOtA0Y0Qv8Wg== X-Received: by 2002:a5d:638b:: with SMTP id p11mr7174651wru.338.1582628143600; Tue, 25 Feb 2020 02:55:43 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 18sm3786682wmf.1.2020.02.25.02.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:55:42 -0800 (PST) Message-Id: In-Reply-To: References: From: "Heba Waly via GitGitGadget" Date: Tue, 25 Feb 2020 10:55:38 +0000 Subject: [PATCH v5 1/3] advice: extract vadvise() from advise() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Heba Waly , Heba Waly Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Heba Waly In preparation for a new advice method, extract a version of advise() that uses an explict 'va_list' parameter. Call it from advise() for a functionally equivalent version. Signed-off-by: Derrick Stolee Signed-off-by: Heba Waly --- advice.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/advice.c b/advice.c index 249c60dcf32..fd836332dad 100644 --- a/advice.c +++ b/advice.c @@ -96,15 +96,12 @@ static struct { { "pushNonFastForward", &advice_push_update_rejected } }; -void advise(const char *advice, ...) +static void vadvise(const char *advice, va_list params) { struct strbuf buf = STRBUF_INIT; - va_list params; const char *cp, *np; - va_start(params, advice); strbuf_vaddf(&buf, advice, params); - va_end(params); for (cp = buf.buf; *cp; cp = np) { np = strchrnul(cp, '\n'); @@ -118,6 +115,14 @@ void advise(const char *advice, ...) strbuf_release(&buf); } +void advise(const char *advice, ...) +{ + va_list params; + va_start(params, advice); + vadvise(advice, params); + va_end(params); +} + int git_default_advice_config(const char *var, const char *value) { const char *k, *slot_name; From patchwork Tue Feb 25 10:55:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11403229 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E87B51395 for ; Tue, 25 Feb 2020 10:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD80C21927 for ; Tue, 25 Feb 2020 10:55:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D2XxW4U8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729814AbgBYKzr (ORCPT ); Tue, 25 Feb 2020 05:55:47 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45534 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729417AbgBYKzq (ORCPT ); Tue, 25 Feb 2020 05:55:46 -0500 Received: by mail-wr1-f66.google.com with SMTP id g3so14116970wrs.12 for ; Tue, 25 Feb 2020 02:55:45 -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=KItkg3ZtIU+uZwxU8FyvK8Pt+sJCV98QvBjZseUvis4=; b=D2XxW4U8hu9gETvEvhn1GqDPNITBLSxSxczJ+33BwM2KCaxyjamDb8mwU+RjBbiXZW PcMtk/LZhPkz5npApSzkKN7BsW8cVMb9VLElBW8j7H7ZpexBhCt8zOZqEPj4PBDeqUZt 4CLFPFjZ4qYP7Hlo9lBLxh+FrNsIXER1pNj7qdAwvgtXgNfi1sbFJll3wt4qydWOrjfZ hBMP+G6LE7vmVEFKLGsGKe28RGINfO+KiH9ORVjmEfAYiR2Fb7YRHG0chx3tfwRUEd/P u8J0RR6rnonVcglyijoNua8DUpDNF7AOaak2zPxzmkPWBqA6KLeZD3qjgZC7QFFjut3R VNUw== 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=KItkg3ZtIU+uZwxU8FyvK8Pt+sJCV98QvBjZseUvis4=; b=KIKSpCaa79KlCmEzE4bZ2z4ydGCqKlldWFwvk24/Oh5kc67GoMA8pm3PVz25HdyzKa DcwGvTL+UQcv89sKTF8Cz+GQR2FsF/Y4dHSlJKAbt0wV4k+wORVi0n4aAvZv8Pp9Eytm XRI3+p68aRHJH++Q4iD+83Vk2JVkIEtZrWccXL86VOh/wq02OGg/ymZAmWbUfH34PPNN Vc97kwM6lNzynkdVYFNXTpDTel75ezq02u4Ip3dJ9cMyBl0v3N9Ta+e+Na9mfj2RDO/Y 1VdVCkB5HajNsLdj8HcWV6Pbwry/0T3CEhJkVGfQd7u78wgx9hPk9VdImcV85LiOsW2C vxgg== X-Gm-Message-State: APjAAAUJsaCECSiGiDFxI0Rup/IHd9jWdsgPBtuZsohGPZoMBuMeoEDj d3lu1mMFfK6LmtK5GGiqQlzkcXHN X-Google-Smtp-Source: APXvYqyi7vPDpUpt9k326L5AOaui6GgkvPN+a06gl/999iQ6Y6KvLTzYcWNAX4JpZS3EbX8GHQAYVw== X-Received: by 2002:a05:6000:192:: with SMTP id p18mr71496387wrx.218.1582628144445; Tue, 25 Feb 2020 02:55:44 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g9sm1710827wme.41.2020.02.25.02.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:55:43 -0800 (PST) Message-Id: In-Reply-To: References: From: "Heba Waly via GitGitGadget" Date: Tue, 25 Feb 2020 10:55:39 +0000 Subject: [PATCH v5 2/3] advice: revamp advise API Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Heba Waly , Heba Waly Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Heba Waly Currently it's very easy for the advice library's callers to miss checking the visibility step before printing an advice. Also, it makes more sense for this step to be handled by the advice library. Add a new advise_if_enabled function that checks the visibility of advice messages before printing. Add a new helper advise_enabled to check the visibility of the advice if the caller needs to carry out complicated processing based on that value. A list of config variables 'advice_config_keys' is added to be used by list_config_advices() instead of 'advice_config[]' because we'll get rid of 'advice_config[]' and the global variables once we migrate all the callers to use the new APIs. Also change the advise call in tag library from advise() to advise_if_enabled() to construct an example of the usage of the new API. Signed-off-by: Heba Waly --- Makefile | 1 + advice.c | 86 ++++++++++++++++++++++++++++++++++++++++-- advice.h | 52 +++++++++++++++++++++++++ t/helper/test-advise.c | 19 ++++++++++ t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/t0018-advice.sh | 32 ++++++++++++++++ 7 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 t/helper/test-advise.c create mode 100755 t/t0018-advice.sh diff --git a/Makefile b/Makefile index 09f98b777ca..ed923a3e818 100644 --- a/Makefile +++ b/Makefile @@ -695,6 +695,7 @@ X = PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) +TEST_BUILTINS_OBJS += test-advise.o TEST_BUILTINS_OBJS += test-chmtime.o TEST_BUILTINS_OBJS += test-config.o TEST_BUILTINS_OBJS += test-ctype.o diff --git a/advice.c b/advice.c index fd836332dad..5c2068b8f8a 100644 --- a/advice.c +++ b/advice.c @@ -96,13 +96,56 @@ static struct { { "pushNonFastForward", &advice_push_update_rejected } }; -static void vadvise(const char *advice, va_list params) +static const char *advice_config_keys[] = { + [ADD_EMBEDDED_REPO] = "addEmbeddedRepo", + [AMWORKDIR] = "amWorkDir", + [CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = "checkoutAmbiguousRemoteBranchName", + [COMMIT_BEFORE_MERGE] = "commitBeforeMerge", + [DETACHED_HEAD] = "detachedHead", + [FETCH_SHOW_FORCED_UPDATES] = "fetchShowForcedUpdates", + [GRAFT_FILE_DEPRECATED] = "graftFileDeprecated", + [IGNORED_HOOK] = "ignoredHook", + [IMPLICIT_IDENTITY] = "implicitIdentity", + [NESTED_TAG] = "nestedTag", + [OBJECT_NAME_WARNING] = "objectNameWarning", + [PUSH_ALREADY_EXISTS] = "pushAlreadyExists", + [PUSH_FETCH_FIRST] = "pushFetchFirst", + [PUSH_NEEDS_FORCE] = "pushNeedsForce", + + /* make this an alias for backward compatibility */ + [PUSH_UPDATE_REJECTED_ALIAS] = "pushNonFastForward", + + [PUSH_NON_FF_CURRENT] = "pushNonFFCurrent", + [PUSH_NON_FF_MATCHING] = "pushNonFFMatching", + [PUSH_UNQUALIFIED_REF_NAME] = "pushUnqualifiedRefName", + [PUSH_UPDATE_REJECTED] = "pushUpdateRejected", + [RESET_QUIET_WARNING] = "resetQuiet", + [RESOLVE_CONFLICT] = "resolveConflict", + [RM_HINTS] = "rmHints", + [SEQUENCER_IN_USE] = "sequencerInUse", + [SET_UPSTREAM_FAILURE] = "setupStreamFailure", + [STATUS_AHEAD_BEHIND_WARNING] = "statusAheadBehindWarning", + [STATUS_HINTS] = "statusHints", + [STATUS_U_OPTION] = "statusUoption", + [SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = "submoduleAlternateErrorStrategyDie", + [WAITING_FOR_EDITOR] = "waitingForEditor", +}; + +static const char turn_off_instructions[] = +N_("\n" + "Disable this message with \"git config %s false\""); + +static void vadvise(const char *advice, int display_instructions, + char *key, va_list params) { struct strbuf buf = STRBUF_INIT; const char *cp, *np; strbuf_vaddf(&buf, advice, params); + if (display_instructions) + strbuf_addf(&buf, turn_off_instructions, key); + for (cp = buf.buf; *cp; cp = np) { np = strchrnul(cp, '\n'); fprintf(stderr, _("%shint: %.*s%s\n"), @@ -119,8 +162,43 @@ void advise(const char *advice, ...) { va_list params; va_start(params, advice); - vadvise(advice, params); + vadvise(advice, 0, "", params); + va_end(params); +} + +static int get_config_value(enum advice_type type) +{ + int value = 1; + char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]); + + git_config_get_bool(key, &value); + free(key); + return value; +} + +int advice_enabled(enum advice_type type) +{ + switch (type) { + case PUSH_UPDATE_REJECTED: + return get_config_value(PUSH_UPDATE_REJECTED) && + get_config_value(PUSH_UPDATE_REJECTED_ALIAS); + default: + return get_config_value(type); + } +} + +void advise_if_enabled(enum advice_type type, const char *advice, ...) +{ + char *key = xstrfmt("%s.%s", "advice", advice_config_keys[type]); + va_list params; + + if (!advice_enabled(type)) + return; + + va_start(params, advice); + vadvise(advice, 1, key, params); va_end(params); + free(key); } int git_default_advice_config(const char *var, const char *value) @@ -159,8 +237,8 @@ void list_config_advices(struct string_list *list, const char *prefix) { int i; - for (i = 0; i < ARRAY_SIZE(advice_config); i++) - list_config_item(list, prefix, advice_config[i].name); + for (i = 0; i < ARRAY_SIZE(advice_config_keys); i++) + list_config_item(list, prefix, advice_config_keys[i]); } int error_resolve_conflict(const char *me) diff --git a/advice.h b/advice.h index b706780614d..a8461a362a3 100644 --- a/advice.h +++ b/advice.h @@ -32,9 +32,61 @@ extern int advice_checkout_ambiguous_remote_branch_name; extern int advice_nested_tag; extern int advice_submodule_alternate_error_strategy_die; +/* + * To add a new advice, you need to: + * Define an advice_type. + * Add a new entry to advice_config_keys list. + * Add the new config variable to Documentation/config/advice.txt. + * Call advise_if_enabled to print your advice. + */ +enum advice_type { + ADD_EMBEDDED_REPO, + AMWORKDIR, + CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME, + COMMIT_BEFORE_MERGE, + DETACHED_HEAD, + FETCH_SHOW_FORCED_UPDATES, + GRAFT_FILE_DEPRECATED, + IGNORED_HOOK, + IMPLICIT_IDENTITY, + NESTED_TAG, + OBJECT_NAME_WARNING, + PUSH_ALREADY_EXISTS, + PUSH_FETCH_FIRST, + PUSH_NEEDS_FORCE, + PUSH_NON_FF_CURRENT, + PUSH_NON_FF_MATCHING, + PUSH_UNQUALIFIED_REF_NAME, + PUSH_UPDATE_REJECTED_ALIAS, + PUSH_UPDATE_REJECTED, + RESET_QUIET_WARNING, + RESOLVE_CONFLICT, + RM_HINTS, + SEQUENCER_IN_USE, + SET_UPSTREAM_FAILURE, + STATUS_AHEAD_BEHIND_WARNING, + STATUS_HINTS, + STATUS_U_OPTION, + SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE, + WAITING_FOR_EDITOR, +}; + + int git_default_advice_config(const char *var, const char *value); __attribute__((format (printf, 1, 2))) void advise(const char *advice, ...); + +/** + Checks if advice type is enabled (can be printed to the user). + Should be called before advise(). + */ +int advice_enabled(enum advice_type type); + +/** + Checks the visibility of the advice before printing. + */ +void advise_if_enabled(enum advice_type type, const char *advice, ...); + int error_resolve_conflict(const char *me); void NORETURN die_resolve_conflict(const char *me); void NORETURN die_conclude_merge(void); diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c new file mode 100644 index 00000000000..279cad6460e --- /dev/null +++ b/t/helper/test-advise.c @@ -0,0 +1,19 @@ +#include "test-tool.h" +#include "cache.h" +#include "advice.h" + +int cmd__advise_if_enabled(int argc, const char **argv) +{ + if (!argv[1]) + die("usage: %s ", argv[0]); + + setup_git_directory(); + + /* + Any advice type can be used for testing, but NESTED_TAG was selected + here and in t0018 where this command is being executed. + */ + advise_if_enabled(NESTED_TAG, argv[1]); + + return 0; +} diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index f20989d4497..6977badc690 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -14,6 +14,7 @@ struct test_cmd { }; static struct test_cmd cmds[] = { + { "advise", cmd__advise_if_enabled }, { "chmtime", cmd__chmtime }, { "config", cmd__config }, { "ctype", cmd__ctype }, diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index 8ed2af71d1b..ca5e33b842f 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -4,6 +4,7 @@ #define USE_THE_INDEX_COMPATIBILITY_MACROS #include "git-compat-util.h" +int cmd__advise_if_enabled(int argc, const char **argv); int cmd__chmtime(int argc, const char **argv); int cmd__config(int argc, const char **argv); int cmd__ctype(int argc, const char **argv); diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh new file mode 100755 index 00000000000..e03554d2f34 --- /dev/null +++ b/t/t0018-advice.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +test_description='Test advise_if_enabled functionality' + +. ./test-lib.sh + +test_expect_success 'advice should be printed when config variable is unset' ' + cat >expect <<-\EOF && + hint: This is a piece of advice + hint: Disable this message with "git config advice.nestedTag false" + EOF + test-tool advise "This is a piece of advice" 2>actual && + test_i18ncmp expect actual +' + +test_expect_success 'advice should be printed when config variable is set to true' ' + cat >expect <<-\EOF && + hint: This is a piece of advice + hint: Disable this message with "git config advice.nestedTag false" + EOF + test_config advice.nestedTag true && + test-tool advise "This is a piece of advice" 2>actual && + test_i18ncmp expect actual +' + +test_expect_success 'advice should not be printed when config variable is set to false' ' + test_config advice.nestedTag false && + test-tool advise "This is a piece of advice" 2>actual && + test_must_be_empty actual +' + +test_done From patchwork Tue Feb 25 10:55:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11403231 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D6211395 for ; Tue, 25 Feb 2020 10:55:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E091D218AC for ; Tue, 25 Feb 2020 10:55:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S1p+x+Bo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729726AbgBYKzr (ORCPT ); Tue, 25 Feb 2020 05:55:47 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:40551 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726019AbgBYKzq (ORCPT ); Tue, 25 Feb 2020 05:55:46 -0500 Received: by mail-wm1-f68.google.com with SMTP id t14so2646649wmi.5 for ; Tue, 25 Feb 2020 02:55:46 -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=ZbArm5/ltUwonlXTTTsbxmBlkxzE7MIsaRPNbv7/5fM=; b=S1p+x+BoBfLt1inIVW0YkSKR1mY+FXSh5kfiFagXxySH6XEwRlbwXyAs4u1qHr7MQZ mzGgm0MzBKBgk/coGWhv1ALfwHyJ6lnritnXAGzp1Ca0MgSnB757+dkRzbaUv+pKK2Ow v1YxO9ApV4BCrU0nnc6PrkRs9OxaQiq2FolIz+dRMyg/LEl/ph30ahLaVDSzWdFwxSgR SIEJESCpIPYEjyrsV5s84hWYJub4lD4PFuThAVCDWS74O73ClhIhlOEq+LnPBolT85DJ UxJ6zqPT123+lLija+HjC94fX4pv8i0ddB4HmfJnEiPP+qT+vsm1nwogb6BFhFsIEdEH Ppaw== 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=ZbArm5/ltUwonlXTTTsbxmBlkxzE7MIsaRPNbv7/5fM=; b=ExCUw4FtyI4UZXyReqUCQOXjIi5I2MVzC7Vw5xwqLSdDn78N9d8qvIq9mu2iBXeWyn xEvqmfd5ZolWBPHpibjYPIanH6KBzR8s3SpFVjbJXeARiOWTYbE+Tdj7ZvEcQtwGWCcq /d/pqYIZyyiZ6Nxbn07qVzh8uv02rQWhK0YsmrSoHtR9VIrtJu5HCuxEdNf9rEDVxeoI PPk+FwY17dl4OBPzVSkgPNobYKRu0r+4Gcy1NxHo2E9VFknnA4qRdavFluavQepVQK/K os4fcdB4Fhc9HkuxpMTY7/nqH1Mn6lCvwem9foY0YCBEAp6Sx1nQacCcwIyQF1Hmh/Z5 98dw== X-Gm-Message-State: APjAAAV1bbNsxfW3RDZqr8Cpekrx8aDXTNsshXN/dTeWgqBenmpp08qD nYHU1uwJPsUfiLlcrErIz/seUq+h X-Google-Smtp-Source: APXvYqyYpQ0ArGzLquq5UHQWI3abYZ96EpWvZwN2KAnWPG7FxcrgHOU0rMciCw/h1RViFYBsszAeGQ== X-Received: by 2002:a1c:6588:: with SMTP id z130mr4608052wmb.0.1582628145426; Tue, 25 Feb 2020 02:55:45 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y131sm3886048wmc.13.2020.02.25.02.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 02:55:44 -0800 (PST) Message-Id: <01b195ebe1d2ab1593915318b7e8adbee5d9614c.1582628141.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Heba Waly via GitGitGadget" Date: Tue, 25 Feb 2020 10:55:40 +0000 Subject: [PATCH v5 3/3] tag: use new advice API to check visibility Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Heba Waly , Heba Waly Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Heba Waly Following the new helpers added to the advice library, replace the global variable check approach by the new API calls Signed-off-by: Heba Waly --- advice.c | 2 -- advice.h | 1 - builtin/tag.c | 5 +++-- t/t7004-tag.sh | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/advice.c b/advice.c index 5c2068b8f8a..ea6e65c1ce0 100644 --- a/advice.c +++ b/advice.c @@ -29,7 +29,6 @@ int advice_ignored_hook = 1; int advice_waiting_for_editor = 1; int advice_graft_file_deprecated = 1; int advice_checkout_ambiguous_remote_branch_name = 1; -int advice_nested_tag = 1; int advice_submodule_alternate_error_strategy_die = 1; static int advice_use_color = -1; @@ -89,7 +88,6 @@ static struct { { "waitingForEditor", &advice_waiting_for_editor }, { "graftFileDeprecated", &advice_graft_file_deprecated }, { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name }, - { "nestedTag", &advice_nested_tag }, { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die }, /* make this an alias for backward compatibility */ diff --git a/advice.h b/advice.h index a8461a362a3..509b562edb1 100644 --- a/advice.h +++ b/advice.h @@ -29,7 +29,6 @@ extern int advice_ignored_hook; extern int advice_waiting_for_editor; extern int advice_graft_file_deprecated; extern int advice_checkout_ambiguous_remote_branch_name; -extern int advice_nested_tag; extern int advice_submodule_alternate_error_strategy_die; /* diff --git a/builtin/tag.c b/builtin/tag.c index e0a4c253828..45e959d5f8f 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -231,8 +231,9 @@ static void create_tag(const struct object_id *object, const char *object_ref, if (type <= OBJ_NONE) die(_("bad object type.")); - if (type == OBJ_TAG && advice_nested_tag) - advise(_(message_advice_nested_tag), tag, object_ref); + if (type == OBJ_TAG) + advise_if_enabled(NESTED_TAG, _(message_advice_nested_tag), + tag, object_ref); strbuf_addf(&header, "object %s\n" diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 6db92bd3ba6..74b637deb25 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1726,6 +1726,7 @@ test_expect_success 'recursive tagging should give advice' ' hint: already a tag. If you meant to tag the object that it points to, use: hint: | hint: git tag -f nested annotated-v4.0^{} + hint: Disable this message with "git config advice.nestedTag false" EOF git tag -m nested nested annotated-v4.0 2>actual && test_i18ncmp expect actual