From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.3 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 0A84E1F404 for ; Wed, 25 Apr 2018 09:54:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751944AbeDYJyf (ORCPT ); Wed, 25 Apr 2018 05:54:35 -0400 Received: from mout.gmx.net ([212.227.17.22]:41983 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbeDYJyb (ORCPT ); Wed, 25 Apr 2018 05:54:31 -0400 Received: from localhost.localdomain ([37.201.195.116]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MNuwp-1fIh7B2ptD-007TDY; Wed, 25 Apr 2018 11:54:26 +0200 From: Johannes Schindelin To: git@vger.kernel.org Cc: Johannes Schindelin , Junio C Hamano , Jakub Narebski , Stefan Beller , Eric Sunshine , Christian Couder , Philip Oakley Subject: [PATCH v5 07/11] Deprecate support for .git/info/grafts Date: Wed, 25 Apr 2018 11:54:25 +0200 Message-Id: <045d75cb198b7854eb951f314124353673c632c0.1524650029.git.johannes.schindelin@gmx.de> X-Mailer: git-send-email 2.17.0.windows.1.33.gfcbb1fa0445 MIME-Version: 1.0 In-Reply-To: References: Fcc: Sent Content-Type: text/plain; charset=UTF-8 X-Provags-ID: V03:K1:6oAjyYlotcb6uUplgxOTEYN76CP0OodseyIKYnV/JUOZ3gMrQRL Bujedqut9aT/T3vLoZK66bNNmNcnngt9Vl57812qP1MlDKBqlhl+fOjM+GvNXpK/41kaZjj ywmW/KekJuXSYMKEctd1KkvtUcK0r9nI/5qeOnNla+/YjDA4bxHHA4B52iwq5M6HaE6hgYA 0b3mAv1c868by4G/67hVA== X-UI-Out-Filterresults: notjunk:1;V01:K0:nX1tZL0vkXg=:tkuervNhdcGxUnOLAD9zfz qbC8OBV/MUDzQJ75TKR9F3ERBsh21PZHRHHSgfQsC69QtA/7ip3B1TWYxBxDP++FC11AJXh+r x4RM0PU0TzDzW3t1Nkgf//CGY9Us/DOZoPHDn1cOl96xE+FaNYDXMnLND5CXUXIZtRIjuKzeP 84fpTlG0YRKr6C9LbXuUeEpEQilMo6bM0Q0gLq1oXdbjQTvPvPVuL0pGZEg5/2vRlQVs4k9Im uszPLMeErk2VLrZdFPvGlMo2B0yRpjVtvgMhBI0iX/o47Qnl77km5fC19oVs2iT+/bqWZgGv0 SB7HzqwXhiXy22I08WgMCRBSxkKberCpXTTtPqQREleByDvybFw/NUeOys2FsCOeJ8mkUKNS1 RS/q5VF9bQcHPuUxFFGzs0/sRxL/D6APxriqwVatqZi+O+E1Wila19h9qOZqmDlSX+QbgWRlc qkEu14nhs8DZa04c3rS7FsQwoRlI35KyESY5Q2JGKzJvDKKTCuuZUo2JAz6t3aByjp3YbdWDo 5rjvIJ/MWtZhMJ/IeIv0PeZLbCLg/44pnlEHKOnzwpyNd2e1TrRSUKBNjtPRZwQ46He+DuR99 BokFOTihWV3iTHGW0/sbmlGsuMlpN6of7mO89xHU1z1HzVOrEIKenSMqgdgHIxJj6HvNGkHu5 5eZXxkzSXjfRE3ZlQ6kan9sruHmOKpwZQlYDuIEK3tn0C4clukpk0qgI8ZjElEBGX1tP2b7zM bPFyYc5mPY0EYFWiZ4THJ44HK30QGq1wk6cQi1b62Jy/yEAbU53CPi/2XNBGuYIEoY4lW7Lwl kMb00ShZxHMo/hslMcnhs119xeepEgOhdr7Db5XN5Wxg3qpPUZnNkC4CYKTlAG798bFFOgv Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The grafts feature was a convenient way to "stitch together" ancient history to the fresh start of linux.git. Its implementation is, however, not up to Git's standards, as there are too many ways where it can lead to surprising and unwelcome behavior. For example, when pushing from a repository with active grafts, it is possible to miss commits that have been "grafted out", resulting in a broken state on the other side. Also, the grafts feature is limited to "rewriting" commits' list of parents, it cannot replace anything else. The much younger feature implemented as `git replace` set out to remedy those limitations and dangerous bugs. Seeing as `git replace` is pretty mature by now (since 4228e8bc98 (replace: add --graft option, 2014-07-19) it can perform the graft file's duties), it is time to deprecate support for the graft file, and to retire it eventually. Signed-off-by: Johannes Schindelin Reviewed-by: Stefan Beller --- advice.c | 2 ++ advice.h | 1 + commit.c | 10 ++++++++++ t/t6001-rev-list-graft.sh | 9 +++++++++ 4 files changed, 22 insertions(+) diff --git a/advice.c b/advice.c index 406efc183ba..4411704fd45 100644 --- a/advice.c +++ b/advice.c @@ -19,6 +19,7 @@ int advice_rm_hints = 1; int advice_add_embedded_repo = 1; int advice_ignored_hook = 1; int advice_waiting_for_editor = 1; +int advice_graft_file_deprecated = 1; static struct { const char *name; @@ -42,6 +43,7 @@ static struct { { "addembeddedrepo", &advice_add_embedded_repo }, { "ignoredhook", &advice_ignored_hook }, { "waitingforeditor", &advice_waiting_for_editor }, + { "graftfiledeprecated", &advice_graft_file_deprecated }, /* make this an alias for backward compatibility */ { "pushnonfastforward", &advice_push_update_rejected } diff --git a/advice.h b/advice.h index 70568fa7922..9f5064e82a8 100644 --- a/advice.h +++ b/advice.h @@ -21,6 +21,7 @@ extern int advice_rm_hints; extern int advice_add_embedded_repo; extern int advice_ignored_hook; extern int advice_waiting_for_editor; +extern int advice_graft_file_deprecated; int git_default_advice_config(const char *var, const char *value); __attribute__((format (printf, 1, 2))) diff --git a/commit.c b/commit.c index 2952ec987c5..451d3ce8dfe 100644 --- a/commit.c +++ b/commit.c @@ -12,6 +12,7 @@ #include "prio-queue.h" #include "sha1-lookup.h" #include "wt-status.h" +#include "advice.h" static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); @@ -176,6 +177,15 @@ static int read_graft_file(const char *graft_file) struct strbuf buf = STRBUF_INIT; if (!fp) return -1; + if (advice_graft_file_deprecated) + advise(_("Support for /info/grafts is deprecated\n" + "and will be removed in a future Git version.\n" + "\n" + "Please use \"git replace --convert-graft-file\"\n" + "to convert the grafts into replace refs.\n" + "\n" + "Turn this message off by running\n" + "\"git config advice.graftFileDeprecated false\"")); while (!strbuf_getwholeline(&buf, fp, '\n')) { /* The format is just "Commit Parent1 Parent2 ...\n" */ struct commit_graft *graft = read_graft_line(&buf); diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh index 05ddc69cf2a..7504ba47511 100755 --- a/t/t6001-rev-list-graft.sh +++ b/t/t6001-rev-list-graft.sh @@ -110,4 +110,13 @@ do " done + +test_expect_success 'show advice that grafts are deprecated' ' + git show HEAD 2>err && + test_i18ngrep "git replace" err && + test_config advice.graftFileDeprecated false && + git show HEAD 2>err && + test_i18ngrep ! "git replace" err +' + test_done -- 2.17.0.windows.1.33.gfcbb1fa0445