From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B48F6C4338F for ; Thu, 12 Aug 2021 13:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89ED961077 for ; Thu, 12 Aug 2021 13:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232172AbhHLNmn (ORCPT ); Thu, 12 Aug 2021 09:42:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237268AbhHLNmj (ORCPT ); Thu, 12 Aug 2021 09:42:39 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EB7DC0613D9 for ; Thu, 12 Aug 2021 06:42:14 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id f9-20020a05600c1549b029025b0f5d8c6cso7167809wmg.4 for ; Thu, 12 Aug 2021 06:42:14 -0700 (PDT) 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=AMG6fvjM/2onHw+M//EEDZvB0BLYtkm6od9UeDwPgkk=; b=E+JcHnNiuD+e7abfNrH16yA6kcMr1V+uO1cvzifJgkmEsuq26owKenYkqnMKBlFOP5 HGwwapGNaiy0hO0+EoQDUeenzPnpQzHn8Mhdq+BOLVjJQ6YHD8W8x6QwvRMxGX03u+IK 0U68iGyJ9w5P4ddMXaW8pvXQjiN/GecLV6jY2p7kJ9+Pv9G4SPPBP5IKfcAUt2rlHxr4 fcZARfVGiQ+0/hxLuKHb9bi6iiy8sXETfvCKTc7tl7eMCrmstkj5EtG6ZX+/q5H1a1Z3 7jIR0CcjyfHnd8XZbB8NrRRRRjd8f0sZJWWUke37xAATgQV2/XKNZzw8Bo4Xjolcd/ZR yfGA== 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=AMG6fvjM/2onHw+M//EEDZvB0BLYtkm6od9UeDwPgkk=; b=S8A2+1Iv4mxa3rslx8ARQnNJR+zvTX7jcJ9TTrF+Csh2vivkVRq8c2MyCepD1LQ92N 3NQ7+7x18FyhM8m2aJCxzMkY044y3r6cUZGOIZUb5bWkS+yx4q3SnNNyeolihItOmTgb EsZnc4ikyHkz5kAzwVTp/mIyBb44xKaDNLqgBUtHEmL3mzfpx44kqS+v61/GLb0AIQOL klpA66h9b9MXwVDPNl+UjqRAsjLulPtsXE6qmQ6c4aa8N0BO84qNlgiT6JA2BFOvoIS+ 6+/fJEqYVxarhfhUGWdKqCl08QR1d06JM3btZWtAeXMLLqlc5iNdrBc3IBrdEOLNr2tA rhCQ== X-Gm-Message-State: AOAM530jLZX2v2L2lDrUUIAaIBt+kDgfYqjhV8Q5oHUGRDo8+qJQW3AG +5N3Qs12U/VJ/d6W2IEYEKyoHx7aTGM= X-Google-Smtp-Source: ABdhPJyPnE2wKBMazkKezNsOs9aw5cHauqa9qWIipPRpVn1ZBiabYiu94zBIBBGNpOTime656+0ZVw== X-Received: by 2002:a1c:f315:: with SMTP id q21mr4125473wmq.76.1628775733081; Thu, 12 Aug 2021 06:42:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m39sm2607566wms.10.2021.08.12.06.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 06:42:12 -0700 (PDT) Message-Id: <028c9dfc460b6c00bf481017a07a2a6d37780a76.1628775729.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Phillip Wood via GitGitGadget" Date: Thu, 12 Aug 2021 13:42:09 +0000 Subject: [PATCH v2 3/3] rebase --continue: remove .git/MERGE_MSG Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood If the user skips the final commit by removing all the changes from the index and worktree with 'git restore' (or read-tree) and then runs 'git rebase --continue' .git/MERGE_MSG is left behind. This will seed the commit message the next time the user commits which is not what we want to happen. Reported-by: Victor Gambier Signed-off-by: Phillip Wood --- sequencer.c | 3 +++ t/t3403-rebase-skip.sh | 8 ++++++++ t/t3418-rebase-continue.sh | 10 ++++++++++ 3 files changed, 21 insertions(+) diff --git a/sequencer.c b/sequencer.c index 7f07cd00f3f..52c7b461179 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4716,6 +4716,9 @@ static int commit_staged_changes(struct repository *r, refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD", NULL, 0)) return error(_("could not remove CHERRY_PICK_HEAD")); + if (unlink(git_path_merge_msg(r)) && errno != ENOENT) + return error_errno(_("could not remove '%s'"), + git_path_merge_msg(r)); if (!final_fixup) return 0; } diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index a44e68d0ffb..f6e48644978 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -20,6 +20,7 @@ test_expect_success setup ' git add hello && git commit -m "hello" && git branch skip-reference && + git tag hello && echo world >> hello && git commit -a -m "hello world" && @@ -96,6 +97,13 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' +test_expect_success 'skipping final pick removes .git/MERGE_MSG' ' + test_must_fail git rebase --onto hello reverted-goodbye^ \ + reverted-goodbye && + git rebase --skip && + test_path_is_missing .git/MERGE_MSG +' + test_expect_success 'correct advice upon picking empty commit' ' test_when_finished "git rebase --abort" && test_must_fail git rebase -i --onto goodbye \ diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index bda5e5db802..738fbae9b29 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -31,6 +31,16 @@ test_expect_success 'merge based rebase --continue with works with touched file' git rebase --continue ' +test_expect_success 'merge based rebase --continue removes .git/MERGE_MSG' ' + git checkout -f --detach topic && + + test_must_fail git rebase --onto main HEAD^ && + git read-tree --reset -u HEAD && + test_path_is_file .git/MERGE_MSG && + git rebase --continue && + test_path_is_missing .git/MERGE_MSG +' + test_expect_success 'apply based rebase --continue works with touched file' ' rm -fr .git/rebase-* && git reset --hard && -- gitgitgadget