From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 2DAF81F601 for ; Thu, 18 Aug 2022 13:15:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244956AbiHRNOS (ORCPT ); Thu, 18 Aug 2022 09:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244791AbiHRNNt (ORCPT ); Thu, 18 Aug 2022 09:13:49 -0400 Received: from mailproxy01.manitu.net (mailproxy01.manitu.net [217.11.48.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E02991005 for ; Thu, 18 Aug 2022 06:13:36 -0700 (PDT) Received: from localhost (unknown [IPv6:2001:9e8:6a5d:5400:e242:9824:2cff:8bd5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: michael@grubix.eu) by mailproxy01.manitu.net (Postfix) with ESMTPSA id 809B112600A5; Thu, 18 Aug 2022 15:13:31 +0200 (CEST) From: Michael J Gruber To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin , Phillip Wood Subject: [PATCH 2/4] sequencer: do not translate parameters to error_resolve_conflict() Date: Thu, 18 Aug 2022 15:13:27 +0200 Message-Id: <4684d54aeb3e00c96ba581c824a04e47b7236db7.1660828108.git.git@grubix.eu> X-Mailer: git-send-email 2.37.2.596.g72ccb331cf In-Reply-To: References: <09rn6r61-38qo-4s1q-q7qq-p5onp6p87o44@tzk.qr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org `error_resolve_conflict()` checks the untranslated action_name parameter, so pass it as is. Suggested-by: Johannes Schindelin Signed-off-by: Michael J Gruber --- sequencer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 51d75dfbe1..8b32b239b9 100644 --- a/sequencer.c +++ b/sequencer.c @@ -537,7 +537,7 @@ static struct tree *empty_tree(struct repository *r) static int error_dirty_index(struct repository *repo, struct replay_opts *opts) { if (repo_read_index_unmerged(repo)) - return error_resolve_conflict(_(action_name(opts))); + return error_resolve_conflict(action_name(opts)); error(_("your local changes would be overwritten by %s."), _(action_name(opts))); @@ -3753,7 +3753,7 @@ static int do_reset(struct repository *r, init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL); if (repo_read_index_unmerged(r)) { - ret = error_resolve_conflict(_(action_name(opts))); + ret = error_resolve_conflict(action_name(opts)); goto cleanup; } -- 2.37.2.596.g72ccb331cf