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.4 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 35FBA1F428 for ; Sat, 28 Apr 2018 22:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752642AbeD1Wo6 (ORCPT ); Sat, 28 Apr 2018 18:44:58 -0400 Received: from mout.gmx.net ([212.227.17.20]:38779 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752307AbeD1Wo5 (ORCPT ); Sat, 28 Apr 2018 18:44:57 -0400 Received: from localhost.localdomain ([37.201.195.116]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LnPnu-1ejFiV0h3u-00heKp; Sun, 29 Apr 2018 00:44:53 +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 v7 08/12] Deprecate support for .git/info/grafts Date: Sun, 29 Apr 2018 00:44:44 +0200 Message-Id: <82ccde9ed8a390133852a5d9e07ef471f94db263.1524955439.git.johannes.schindelin@gmx.de> X-Mailer: git-send-email 2.17.0.windows.1.36.gdf4ca5fb72a MIME-Version: 1.0 In-Reply-To: References: Fcc: Sent Content-Type: text/plain; charset=UTF-8 X-Provags-ID: V03:K1:pLSYYpYQBbHNPJe4pzBAHtjBll+8hWhg/ao/Wpc17VurvaNUEKC eLpM76+0aONSwROp31KZbaUcmdRWfN+79AQp+kgLSU503nZ2RPHJ5RC5K9LNoO6mWPX35jR gFbqMD4Lq1oeR8y+BNSWPZ4cD+TyGcDIjda2Bs4gvMoFH+hbWxBY0B4vYwPRdG3EbkSLJwl RFXIRiPVfE/7HjqRdlPRw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Dtj/vnj7fEg=:kYoamiScNYceJ3WJd5OocI f6kKy0GPlBHdUOkpd5ebVFRxaEbvHP/+qqYMsnHnF4oIlbQZPwWcIyQAfem3anwWH2OgQfucm n03FlbrtfzBnAhuW0lJtDWmpb9mQ6vI/aJxZuQPp7RMZE4TWsbiuCJk7h8J53zgV4to67tYF1 nRZCcZ+LJ8CVYdnLkSp/WNJaVFhMdY3rEU1cqkvRnlxHtYGjI3oxf6DmHhDYjDfFBvp8sCNV1 FXG4vh31rS1hYhFlFb3MclFn59YNTKsTiuIrdzofP0nRh8x9bPQZ3c3o1yzpUbqup3/Z3ctg4 5PvcTZB1OILFmb1hQfV9bgporzZHIsFqF4pzenc24ZIGy+my7Aa7KzsLtqnhJl2yWRwK+oEyJ Dv0w+lvZzo9GmIaRhkv++WUroY3DuZo1mi4Fp34eav/gMvxmIJcbti8P2hhH732Ksc+e+gj6d 2PfUK6r9UobrZ+Sn7Qcwsv2ZPbGcbCdc0zWdISgM2hKyVIqXsWGIj7UT5YzUlg4RaLkjjscvX i/sC8aYNKoKXzJ6cUoOOOOxjGw2m94NhrjsuzwZrZjIwZg2qoPjr02E5fDUBTc1Eq0hRNJ87t cUxwumGPre9T9S6VGm0jmakCfNgsjVqBbtzbY+PBjAwjwUX/IF3ANL5RPY9KEnLP6Q2xSlwaA p0bt7mdveCfJjNMWPacGLn7FZl/Ehjc84GxshjurlempUWYF8qbnNckdP6WPn60dD2Ql+4VC/ eIVDxoAFMSX6Sf0tn9RK+KYADz7q1tgpo2foLfpfdeFXgcK2KFIHqv9OP0oTIgF635CqHuHC/ cvzqTNq 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.36.gdf4ca5fb72a