From patchwork Sat Jun 4 11:17:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 12869609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDD4ACCA47F for ; Sat, 4 Jun 2022 11:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235126AbiFDLR7 (ORCPT ); Sat, 4 Jun 2022 07:17:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231179AbiFDLR5 (ORCPT ); Sat, 4 Jun 2022 07:17:57 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05FE6140F9 for ; Sat, 4 Jun 2022 04:17:54 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id q15so5353259wrc.11 for ; Sat, 04 Jun 2022 04:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=X5jufu0KHv3cSskIgAE0ac8TXDrgVBE5lhiJOG92Fjw=; b=It2lgngf+4yX4NwFqn9WVICKdbtMenJ1JcwxaKxpME5TEpXne9VTntxui+K8+0V7Ho PPtUbu2fZgubKVk1CvdIyUX5ZPyS8ZCPLDG+CzQShbCjBiZKb4btuEAOP1JgAbBaAJbv m0Q2IsUWANCoMMd5m44celZSPEkwX/26lRu1o2wPR85l1Uc/gSzVtVKUXSdm9YJre+Op dXFQmA6bC2AEFI+xX/bVl0jAsyTBjCI2ylCyFMmL8JpKdXazz0YJ+CriBsw+xHpDCl1q DNoJB5YJwT5BMAwQOx072I39kiAegG4fofuzkE7yUOL00v0x3ntrnwne3E+GxYI+JuQ7 r8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=X5jufu0KHv3cSskIgAE0ac8TXDrgVBE5lhiJOG92Fjw=; b=mNcRDA7d5nj3Tyv8/l4T9MoBWrGQsJmJuquzVmeGlzSCeg4fNjMtcL2EJu0PBFkKvY QM3FRAA5quij5mno3XFpb0wYNCWwFdIoNuY8v+b+8yMh5nA2/wJjpZSJbpJm5hq4fB+6 GE2ViCAK1c1TlmODycsDQ3lZO7qW1ydmrsP/c3TqsSh780GgGEodf0IWib9Vqazpvfew msz2VHfo47qjqYawsbFgW5EZjKxgS2zh0hTxmO9S/2EFU8nLIT6adHPF87AeOayswndz JFA0Xy/qD5eTSDVFvoMRrnJZQyEv3to7OLicLKSP3tfNDZLik7MVQwufFGg2NKZS8spl Ek0w== X-Gm-Message-State: AOAM530wnxkgABAAaSXx2LBvRy3UA+aULLKZ878rB7KUIsTPLxvmu55b sb1eYqz3HH2iF2sHlnl7N2KTUHCVEBy+QK6H X-Google-Smtp-Source: ABdhPJyiz4sk01mngRVd4a6AfAaQIztUlJ2ZCjV+PRj0SjFZjhThKEQa7hHGMx4rcbjQNMtNZGMqpg== X-Received: by 2002:a5d:4c86:0:b0:210:2e6e:3a93 with SMTP id z6-20020a5d4c86000000b002102e6e3a93mr12203464wrs.185.1654341472034; Sat, 04 Jun 2022 04:17:52 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n13-20020a5d400d000000b0020ff7246934sm9989065wrp.95.2022.06.04.04.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:17:51 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 04 Jun 2022 11:17:46 +0000 Subject: [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philip Oakley , =?utf-8?b?UmVuw6k=?= Scharfe , Philip Oakley , Philip Oakley Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philip Oakley From: Philip Oakley Since feebd2d256 (rebase: hide --preserve-merges option, 2019-10-18) this option is now removed as stated in the subsequent release notes. Fix and reflow the option tip. Signed-off-by: Philip Oakley --- builtin/rebase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 7ab50cda2ad..bad95d98adf 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1110,8 +1110,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_interactive), OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected, - N_("(DEPRECATED) try to recreate merges instead of " - "ignoring them"), + N_("(REMOVED) was: try to recreate merges " + "instead of ignoring them"), 1, PARSE_OPT_HIDDEN), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", From patchwork Sat Jun 4 11:17:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 12869608 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA1A3C43334 for ; Sat, 4 Jun 2022 11:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235134AbiFDLSC (ORCPT ); Sat, 4 Jun 2022 07:18:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234999AbiFDLR5 (ORCPT ); Sat, 4 Jun 2022 07:17:57 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1032F1D30E for ; Sat, 4 Jun 2022 04:17:55 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id u8so9056048wrm.13 for ; Sat, 04 Jun 2022 04:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=SB5BD0xi1BgeKYveuZXRwolzoUpagPJ9nSfk/TvDhRI=; b=CV0u5qAnrB7VtQMb//m42uagcKSlaqQmkj28bs9QWwAJZAX9EK4ztObX0onHELyoof 7iRy+v3fyJmQET0PVKCKV4Zt5jshQpFMGaNHcR3Fww8voVc2n1o+1oI+x/8V4buxQTwo d5Ds6AbdS6M0Q/JIBwmuA07CswftmeB4YEZ8aj7EWtLG3uKSdLWlTDtcwTPykKYq6WgZ P8AQFxyVdOXTD4l6r11033s1JHFYXmN11J4DwpBjrM5amj0BV3xnIAVeGYmYsaGg1tia w8c+ShE8/415I/fyOBvBUF4/Et5rhb8YqyQp0eHmGvMojsGE4A5N5+UW2N3KDBSz4McO EUkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=SB5BD0xi1BgeKYveuZXRwolzoUpagPJ9nSfk/TvDhRI=; b=Me1tBftyifamIDKsQjmm/XKN08E3Qw1BTaZEE7vy2HZZBbiODHTRu8jpREovPUOySw TxfMbuDCTwubzz0wQjC/mYW+Q4KMjaqqvunf1HQ3FlptP5hDq7GReHHrQ3As7ps36SWx NTgZl0ogHVeV5eKusgB9Nv8xdmChcIIAltq21SZ542+MHdM8Ujg/ZGHTavGeZRt6ZTOg /SObiqmTqVUsd03Gn6LXtuGECAYdcsR7iZCfpgaiO4+FUKVhnL4ftCyYd1x5DUr7tolW PqgYXzxF2WUhkQ8Byv+mas0g3PvgCy0SRH+KTCKFQY8U+/4qtDb7DpyYZKzxCPoOZtR2 hzig== X-Gm-Message-State: AOAM531OsNDtSxaqxVzc683cFU2gOZ4oZF1uzhxEeMim84MolFX+7pCE wspUCQwySkKF5uOOEsAyz0PBkEY40zf4wyS3 X-Google-Smtp-Source: ABdhPJx3jCbo7ZoR6dC7kx64o49hww8dURyUSdCKas9LFI7SdVPmRYKck52SLaO9Qm2jF5/v255aCg== X-Received: by 2002:a05:6000:1f0e:b0:20e:6f3e:d882 with SMTP id bv14-20020a0560001f0e00b0020e6f3ed882mr11917178wrb.370.1654341473246; Sat, 04 Jun 2022 04:17:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k5-20020adff285000000b002101ed6e70fsm5806121wro.37.2022.06.04.04.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:17:52 -0700 (PDT) Message-Id: <47f271875291d24666c5a3cec895421ab646f1f3.1654341469.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 04 Jun 2022 11:17:47 +0000 Subject: [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philip Oakley , =?utf-8?b?UmVuw6k=?= Scharfe , Philip Oakley , Philip Oakley Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philip Oakley From: Philip Oakley Git would die if a "rebase --preserve-merges" was in progress. Users could neither --quit, --abort, nor --continue the rebase. Make the `rebase --abort` option available to allow users to remove traces of any preserve-merges rebase, even if they had upgraded during a rebase. One trigger case was an unexpectedly difficult to resolve conflict, as reported on the `git-users` group. (https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM) Other potential use-cases include git-experts using the portable 'Git on a stick' to help users with an older git version. Signed-off-by: Philip Oakley --- builtin/rebase.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index bad95d98adf..17cc776b4b1 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1182,8 +1182,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } else if (is_directory(merge_dir())) { strbuf_reset(&buf); strbuf_addf(&buf, "%s/rewritten", merge_dir()); - if (is_directory(buf.buf)) { - die("`rebase -p` is no longer supported"); + if (!(action == ACTION_ABORT) && is_directory(buf.buf)) { + die("`rebase --preserve-merges` (-p) is no longer supported.\n" + "Use `git rebase --abort` to terminate current rebase.\n" + "Or downgrade to v2.33, or earlier, to complete the rebase."); } else { strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir()); From patchwork Sat Jun 4 11:17:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 12869607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9164C433EF for ; Sat, 4 Jun 2022 11:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235159AbiFDLSE (ORCPT ); Sat, 4 Jun 2022 07:18:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234825AbiFDLR5 (ORCPT ); Sat, 4 Jun 2022 07:17:57 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C1D51F620 for ; Sat, 4 Jun 2022 04:17:56 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id u8so9056092wrm.13 for ; Sat, 04 Jun 2022 04:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=0JP3vqFd04HuLyUor0tZpNkGmwQPKOs/mYUhfcjqENk=; b=ThKtTRn5WsrM3tW3AityUg1HwqQLrExCnMpnYK1kiV6Gl76M+ZL76TMa2BJ5R1GZTf OkXtMEqNnvHcgQi2L5Nt2kIPz676b5VZJBofi2d5fes229ZuipWE3QTGTJ/dohVivJZU KHVjFt21ca7lV475qXrxv+NgYv7MDyl4RkcnYbby8ckDMPRNSWE0ZImvJD+MWjhFP0Np FV0e+HX6nHldcLdOKux+4TrTCwqHv2apKFtQ1yM09RCuRkZ6cCkIKXuG6vnH962nzwvV hbnmzaWqHpm8+ko9nUkrQqS6xQR9AerVHUkWQJwa3b9L+DXG9IqDlfb9H8mdMkQ2PR78 Si+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=0JP3vqFd04HuLyUor0tZpNkGmwQPKOs/mYUhfcjqENk=; b=Iyg4wlTbjR/mYpTVnQ/N5ZTIDTvCl+lEpv7H5cIV1ubWzdTNQPVCYu2a9a6ftxq6ap fLjpQkuaYhh1zWaZLrjWD2AADmQN7XROhLKi4mcedVPPq83MZvRT8e+tR+nn5HnxXl38 UbLqOfa8s7KaJIPXT24MPUjZO6AJCm/qZa3O7Fex+H8KHU7WnX7yhZZT7VaLCO7vXJqx 8Jfybd2q4JO1gXnHA7dxJWEoBQksgzxA/Fq7nAEtfeJD0K2e6S6U1rXZyh40+0K9nNYs DcpCXDoDFLsj9UEa2tA7uKyei/yKfFkqv/RMdo07Xjcoz/nr4LS0y0+PqZ5uJ/ycuo3h v7hA== X-Gm-Message-State: AOAM530AbSTVAbGs8+e4S0o5BzMMkjpJLjF0kTyZAbYLwAVNoZcOtG84 8YwR3awMuGG/jwVcI7q2F43l2qYtQA8VGnat X-Google-Smtp-Source: ABdhPJzxvg6J2qyviZ6qCc0PMNu/outTVy66isyWTgMRiUntqaxnQtG/CGdoG/V8U3d8T4sNdhEEig== X-Received: by 2002:adf:c64c:0:b0:20f:e8f0:be4c with SMTP id u12-20020adfc64c000000b0020fe8f0be4cmr12383083wrg.614.1654341474473; Sat, 04 Jun 2022 04:17:54 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g19-20020a05600c4ed300b0039c4506bd25sm2971473wmq.14.2022.06.04.04.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:17:53 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 04 Jun 2022 11:17:48 +0000 Subject: [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philip Oakley , =?utf-8?b?UmVuw6k=?= Scharfe , Philip Oakley , Philip Oakley Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philip Oakley From: Philip Oakley The `--preserve-merges` option was removed by v2.34.0. However users may not be aware that it is also a Pull configuration option, which is still offered by major IDE vendors such as Visual Studio. Extend the `--preserve-merges` die message to also direct users to the possible use of the `preserve` option in the `pull.rebase` config. This is an additional 'belt and braces' information statement. Signed-off-by: Philip Oakley --- builtin/rebase.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 17cc776b4b1..5f8921551e1 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1205,7 +1205,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) builtin_rebase_usage, 0); if (preserve_merges_selected) - die(_("--preserve-merges was replaced by --rebase-merges")); + die(_("--preserve-merges was replaced by --rebase-merges\n" + "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" + "which is no longer supported; use 'merges' instead")); if (action != ACTION_NONE && total_argc != 2) { usage_with_options(builtin_rebase_usage, From patchwork Sat Jun 4 11:17:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Oakley X-Patchwork-Id: 12869610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAD60CCA477 for ; Sat, 4 Jun 2022 11:18:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235167AbiFDLSG (ORCPT ); Sat, 4 Jun 2022 07:18:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235114AbiFDLR6 (ORCPT ); Sat, 4 Jun 2022 07:17:58 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76B0897 for ; Sat, 4 Jun 2022 04:17:57 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id d14so4388374wra.10 for ; Sat, 04 Jun 2022 04:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=4yB7Px2TZcbzgD7bLULWr1MIQJCMeGKAZG3VIdlHz88=; b=AcfRDXbIzO2Z0gQgRGfAt/wwx1tn5Yp47cx0LnShRNCKvWsB16c/6z5wEv/ZOIFqAA 9eCM8yksb/3gWZIFNfwgquAvmgDm2ZbEoliZobcZzKEn/wKzZtM6G74Gg8sqpRE+4tKM LMJabGg2Z8NYM5dEkGMeshxm3XBrUl0/c9Z6/TZbpfRwNHIQ9fIbdgWfE3rkfdr/o97N B+G+dq5zxEg4tnah0147oCwAa7Df7yp7//GxKX5MZRZs/D//SU9M45+YbCstW8MazLji n/8Xu/YIyIvFLBadxjOekDkm0D6hMdynluuAhYhIb6WXQXvyoOvRMP1CE0vjKMk+xDqm l38w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=4yB7Px2TZcbzgD7bLULWr1MIQJCMeGKAZG3VIdlHz88=; b=UzGLXMmAAMbDJPUDIWXah3MmfqEUFxUzM/YehZOOenM4G9OmodxJQq/VQebp5SrijR xSGcvNsEya6RFxvl09DTyzTCkQds5Sb2zeVB3byODP+zZjt5NuDTtR09V+1SsXDqfKa6 VAzUMJJXapJRRVaWt42iZkpM9FvFNxfuwDyWLrY3kFEw0ZYwga6DNaI6WKFs6xCbt5vB lCKDQT1dAfPs6vhnrQl9Kqut9c7QvfRY+FGEeLXr8E2nsX9Fp70hmKif/swYLe3L0iYC aAwQCUUm8CUW0T2yuYK8pBZ4BBUm0ifDMjpF7zukRs/2JblkkgWLJnWgdu5uzWOtOJnB mzGA== X-Gm-Message-State: AOAM532fsCqqmpB6mCI6h+0JcVLnu44LHIKl7izP6utUmrBzMs8SQggp 3P97rEXwZPxTfLh4s9RSt7HXEF0H5PhleU8p X-Google-Smtp-Source: ABdhPJzuJmp9c87BG4WK+K5j/YTsPB2Mcqvr0zgepG1jHCjgfWTVWzmfd91OtFBgPkauRr20MzZu/A== X-Received: by 2002:a05:6000:1842:b0:210:3d62:2768 with SMTP id c2-20020a056000184200b002103d622768mr12438925wri.301.1654341475648; Sat, 04 Jun 2022 04:17:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r19-20020a05600c35d300b0039c2e2d0502sm8811970wmq.4.2022.06.04.04.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 04:17:55 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 04 Jun 2022 11:17:49 +0000 Subject: [PATCH v2 4/4] rebase: translate a die(preserve-merges) message Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Philip Oakley , =?utf-8?b?UmVuw6k=?= Scharfe , Philip Oakley , Philip Oakley Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philip Oakley From: Philip Oakley This is a user facing message for a situation seen in the wild. Translate it. Signed-off-by: Philip Oakley --- builtin/rebase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 5f8921551e1..640b6046a5a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1183,9 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_reset(&buf); strbuf_addf(&buf, "%s/rewritten", merge_dir()); if (!(action == ACTION_ABORT) && is_directory(buf.buf)) { - die("`rebase --preserve-merges` (-p) is no longer supported.\n" + die(_("`rebase --preserve-merges` (-p) is no longer supported.\n" "Use `git rebase --abort` to terminate current rebase.\n" - "Or downgrade to v2.33, or earlier, to complete the rebase."); + "Or downgrade to v2.33, or earlier, to complete the rebase.")); } else { strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir());