From patchwork Sat Feb 15 21:36:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11384121 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 5A1A814E3 for ; Sat, 15 Feb 2020 21:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DEB0217F4 for ; Sat, 15 Feb 2020 21:36:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y6WdRFtP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726957AbgBOVgq (ORCPT ); Sat, 15 Feb 2020 16:36:46 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50828 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726275AbgBOVgq (ORCPT ); Sat, 15 Feb 2020 16:36:46 -0500 Received: by mail-wm1-f68.google.com with SMTP id a5so13508208wmb.0 for ; Sat, 15 Feb 2020 13:36: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=3IyIY6+Nk/2dCh9RYX4x+RM8iaX7XYvZbmfA9bqZvX8=; b=Y6WdRFtPJs9Oz7QFbmyEC8VnJ+D7zPhBF9qrwn7Jl4204r9ZctY0TYdofD6sMG5UCY I+nSMAfykqB3nmcaTArPBEfSy6E7xeYqpp2jCcEoirTgBaTF79DE8hXtY82FfGJS5sjL 0ace04Sea6EghtMERUPkcA0bT62AGAGzKiuj1X1YmkHAPr3735X502om0qDjbxqokzLR htV/WiP43Tyo0Ml7Zcfccqh45GYADdYV04lxwGeNYc91YJ9rkvL0SNZdj9oYrnX+xzLm AA6qIpHPz23TVSOr+kEM1bRcwFs8Y0mXSzYSQapiPt2Jm+QoC8z/V+LJxjDdHym8qvFP PNkg== 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=3IyIY6+Nk/2dCh9RYX4x+RM8iaX7XYvZbmfA9bqZvX8=; b=LMq05wXrYvcN5bvea/lwK6ohi5VK7jfNMuHZ8y5WkxP0pogdYe0gZhaqtC7VGZZn0E +Wpx+berLj+CQ7hTwvMvVdQauRKYN5yTJWf4ROukI1/0jlsK1pCux8+s6JGAJReGEjR6 TrbIZZyVBCh68oEJm1z1o9nWYAwjX1NXhuu0CpuljYbBkvk2eIExgjWUh9zRszPfMZ54 GkE0MYVw9JC54RKPht+hTDpwgAsnMe05daQOYgCBeHYSdO7RuBdRVjeNojuR9DelMDjl /GiI0hE6epvpr8Msd1bzY2OhsdBjpxbBIdFTPkcr/MbwMH9GIholAZH0XNHbVY0LiKXd BF5w== X-Gm-Message-State: APjAAAVitKyI61yg+L9cl0rnsYPofp5WM5mHUfzGeYu6kztzcxfULF5L mAKyZyM+b8E7n8OiHcXkeg8rqIB+ X-Google-Smtp-Source: APXvYqzJndOxggEu/vMeUAxUofVIKmSFADSoDw0hjr41OMGuVVyCPIfgM+LjpekCGb2noxJJLG21Aw== X-Received: by 2002:a1c:a1c3:: with SMTP id k186mr12361678wme.179.1581802604107; Sat, 15 Feb 2020 13:36:44 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x6sm12782837wrr.6.2020.02.15.13.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 13:36:43 -0800 (PST) Message-Id: <3ea48d53940cb7e1a82a8a6eb819497c0448af6a.1581802602.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sat, 15 Feb 2020 21:36:22 +0000 Subject: [PATCH v5 01/20] git-rebase.txt: update description of --allow-empty-message Fcc: Sent 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 Commit b00bf1c9a8dd ("git-rebase: make --allow-empty-message the default", 2018-06-27) made --allow-empty-message the default and thus turned --allow-empty-message into a no-op but did not update the documentation to reflect this. Update the documentation now, and hide the option from the normal -h output since it is not useful. Signed-off-by: Elijah Newren --- Documentation/git-rebase.txt | 7 ++++--- builtin/rebase.c | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 0c4f038dd60..c83be7ffc20 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -265,9 +265,10 @@ See also INCOMPATIBLE OPTIONS below. See also INCOMPATIBLE OPTIONS below. --allow-empty-message:: - By default, rebasing commits with an empty message will fail. - This option overrides that behavior, allowing commits with empty - messages to be rebased. + No-op. Rebasing commits with an empty message used to fail + and this option would override that behavior, allowing commits + with empty messages to be rebased. Now commits with an empty + message do not cause rebasing to halt. + See also INCOMPATIBLE OPTIONS below. diff --git a/builtin/rebase.c b/builtin/rebase.c index 8081741f8aa..faa4e0d4065 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -453,8 +453,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"), REBASE_FORCE), OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")), - OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message, - N_("allow commits with empty messages")), + OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message, + N_("allow commits with empty messages"), + PARSE_OPT_HIDDEN), OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")), OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins, N_("keep original branch points of cousins")), @@ -1495,9 +1496,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_STRING_LIST('x', "exec", &exec, N_("exec"), N_("add exec lines after each commit of the " "editable list")), - OPT_BOOL(0, "allow-empty-message", - &options.allow_empty_message, - N_("allow rebasing commits with empty messages")), + OPT_BOOL_F(0, "allow-empty-message", + &options.allow_empty_message, + N_("allow rebasing commits with empty messages"), + PARSE_OPT_HIDDEN), {OPTION_STRING, 'r', "rebase-merges", &rebase_merges, N_("mode"), N_("try to rebase merges instead of skipping them"),