From patchwork Fri Mar 28 17:03:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 14032257 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 401BC1A08B1 for ; Fri, 28 Mar 2025 17:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181409; cv=none; b=acJKy+wipkj3HSCS4q0XohdpSata730ap695q5rO5dnEIqsBNwd9dPEnBHUfNOTp9UEsB9S2lfcHSK3jMoQv0wHsByrmXEGBLUqlz2lOYXJaPsZpw74Ax6MR98ExUHyV4q0sNDfbrXNEs/iARA8aqTpScWg6GTL+tPWL4nA7r5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181409; c=relaxed/simple; bh=qXedR5B1PsWSLg5Y/zRc1fb3T0XDloxD+aOIBnvsvQM=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=iHbFBZARMFG71rtaqqdrQVp1Ry69Ph7KCmAaRtZO/AdVgO1YE8giGzKn4o2SgfRvA2Tr9oIKTAmrcnJ5TjBzSxtlRj+QvOgXClWVXCXw256BGm6l+Ye/ijBWacV5pzlsdVgo705supc3ePaCBnhRxcEr8j0xGdcmeLhlqHs3l1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MUTY6tGc; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MUTY6tGc" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so19275715e9.2 for ; Fri, 28 Mar 2025 10:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743181405; x=1743786205; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=M6E3s83jH4uJYUhqQaNk5TKnFMkjYF9WLce23Lj6egg=; b=MUTY6tGc88Ssv0sJq6e8uQlMGe/tDb4dcABwW0FmkpJDER/mIo/86pPOufd5KiQlT4 CNNGi2CGtEUQhOTciP36Eq49hqgiBuB9fWE2lwuARkbtXecYVj7BJDQk9vaR/hZ3zwUl 6gHmY9AYV5Lz2oQxa8pZ0SygAmxLPEOVjgdZEA25ZjH4giv/MIokGeK4NLUGMPHxDu3m kqxZmaidqeqhha2wgWIltoyZ8bXfpzGROb9NYE43jQKXtakCPqSXE4CNXRXUXnXhi6bW MAOhfa6fDnKgRmTGBiifaQcZLvTZodi53/diAp4nA7yZu4K4TPLzgDjMA2fmKgrZp9qT vegw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743181405; x=1743786205; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M6E3s83jH4uJYUhqQaNk5TKnFMkjYF9WLce23Lj6egg=; b=fTlKkcfOlLiqXkd5P7Daw2jyufBLMQtaysnKnYD1DO2Ig1VERY6AOzx+OXiw618kQG nfdCULDQHHQz6Vq1tVSsnZjJRYp/AXy4szM6oZTHIA5UTrT7BFdCPLe10Kl3el4heopA CIKtFy6A24NRsHkvMIzqFx3g5FLc3EW9oYjon1WbD55JAgnbfkIlzmiLA0y1VJ5qcx2T kPvqBzRp5vG7k843ey0q/WuArh+wgk+2I/xIrno75yDbDGO5ZYhJMltQfQDtndsZTA37 wHk5wLGQU3U/MyIaxOhGlo/8svvtLf27XPEZ1aPAsk9Yx8djYc9mP7c3euSytHmUlVCk N9nA== X-Gm-Message-State: AOJu0Yx5RwSUeqWczOxS0TY6oujcQcruujOl+12CJTbrR4qCDP3ustbT F9B/y/PGozMyW1OyBDx/l1T8UQYskbE7q4mplGyh0ZxEHd31cmpAUKQahQ== X-Gm-Gg: ASbGncvEBgSDhyF7gM+s0A50W1rSamyI7tYnLM9dbUC6T76M8gxHziwF551h+bKamag SltlgFgXDZZC4hs5CK9w9HMOBP5ueVms8T2lA2GJPC3IARfRmWRw5z0EomDBAxcCD3Mjd42HPbs kugFm1fYAybpaBoWRABq74/5JGzU/4L3jK/Q3A1xYImm9N82rXsbeoK3eS+wFp5JHics9wI5E7M PzKbTpWRLvIa9bqRhx2v/ERBF2Fd8dHjXgyk0Ef8s/yghTl38r46EFtIY22ErbjR6EnFdJYF8pV U6Sr0rZfzCix8P72hIgoKBMIN+gMwQ0mmjgFFiamXW/hpg== X-Google-Smtp-Source: AGHT+IHa2KnppQY4juMZMUxHogLqBV5310vupg3GL/vz7DuY9pjCgqMd4GWDn2gKLZqQkPN37RNTiw== X-Received: by 2002:a5d:584a:0:b0:391:41c9:7a87 with SMTP id ffacd0b85a97d-39ad17988dcmr8375084f8f.51.1743181403803; Fri, 28 Mar 2025 10:03:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d8ff02f9csm34057795e9.26.2025.03.28.10.03.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:03:23 -0700 (PDT) Message-Id: <6c8f77cb71c7e0c820704b1725331f4601d8876e.1743181401.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 28 Mar 2025 17:03:19 +0000 Subject: [PATCH 1/3] rebase -r: do create merge commit after empty resolution Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Johannes Schindelin , Philippe Blain , Philippe Blain From: Philippe Blain From: Philippe Blain When a user runs 'git rebase --continue' to conclude a conflicted merge during a 'git rebase -r' invocation, we do not create a merge commit if the resolution was empty (i.e. if the index and HEAD are identical). We simply continue the rebase as if no 'merge' instruction had been given. This is confusing since all commits from the side branch are absent from the rebased history. What's more, if that 'merge' is the last instruction in the todo list, we fail to remove the merge state, such that running 'git status' shows we are still merging after the rebase has concluded. This happens because in 'sequencer.c::commit_staged_changes', we exit early before calling 'run_git_commit' if 'is_clean' is true, i.e. if nothing is staged. Fix this by also checking for the presence of MERGE_HEAD before exiting early, such that we do call 'run_git_commit' when MERGE_HEAD is present. This also ensures that we unlink git_path_merge_head later in 'commit_staged_changes' to clear the merge state. Make sure to also remove MERGE_HEAD when a merge command fails to start. We already remove MERGE_MSG since e032abd5a0 (rebase: fix rewritten list for failed pick, 2023-09-06). Removing MERGE_HEAD ensures that in this situation, upon 'git rebase --continue' we still exit early in 'commit_staged_changes', without calling 'run_git_commit'. This is already covered by t5407.11, which fails without this change because we enter 'run_git_commit' and then fail to find 'rebase_path_message'. Signed-off-by: Philippe Blain --- sequencer.c | 3 ++- t/t3418-rebase-continue.sh | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index ad0ab75c8d4..2baaf716a3c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4349,6 +4349,7 @@ static int do_merge(struct repository *r, error(_("could not even attempt to merge '%.*s'"), merge_arg_len, arg); unlink(git_path_merge_msg(r)); + unlink(git_path_merge_head(r)); goto leave_merge; } /* @@ -5364,7 +5365,7 @@ static int commit_staged_changes(struct repository *r, flags |= AMEND_MSG; } - if (is_clean) { + if (is_clean && !file_exists(git_path_merge_head(r))) { if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && refs_delete_ref(get_main_ref_store(r), "", diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 127216f7225..f4b459fea16 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -111,6 +111,30 @@ test_expect_success 'rebase -r passes merge strategy options correctly' ' git rebase --continue ' +test_expect_success '--continue creates merge commit after empty resolution' ' + git reset --hard main && + git checkout -b rebase_i_merge && + test_commit unrelated && + git checkout -b rebase_i_merge_side && + test_commit side2 main.txt && + git checkout rebase_i_merge && + test_commit side1 main.txt && + PICK=$(git rev-parse --short rebase_i_merge) && + test_must_fail git merge rebase_i_merge_side && + echo side1 >main.txt && + git add main.txt && + test_tick && + git commit --no-edit && + FAKE_LINES="1 2 3 5 6 7 8 9 10 11" && + export FAKE_LINES && + test_must_fail git rebase -ir main && + echo side1 >main.txt && + git add main.txt && + git rebase --continue && + git log --merges >out && + test_grep "Merge branch '\''rebase_i_merge_side'\''" out +' + test_expect_success '--skip after failed fixup cleans commit message' ' test_when_finished "test_might_fail git rebase --abort" && git checkout -b with-conflicting-fixup && From patchwork Fri Mar 28 17:03:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 14032258 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4781B1DB55D for ; Fri, 28 Mar 2025 17:03:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181410; cv=none; b=cLrw6CKS3YEl+VRlynaCxN4s9ObztbDrLjZKeL/8IUJ0K6d71uTVnvzs0X1HIY9XD+0EK7tEAcXixG9oX5P9Nm9tSjxofYCeX4lbZyeo34RnqdJc/yPxsjvErQNBepkQ2hH6qU103/Woq8Clwxwj8IvtaC+mGJcg4CQAQykj04I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181410; c=relaxed/simple; bh=iYtNqlSwK9xdOd7w7JXdt9lzWtMhCh3w82NHPqCmNy8=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=fwyvW3VfNmxBZLItyH7Noh5u9Oq320bcaByKC3KTyEu+3K/EFRiRZMsqwQ3g54yEi0I6lultgt9vLNacNHh9NycEMMkC+fNibdVv0Js4gNmp2zqXqKOVhUsboxkCVpXYI3d+gKGNuW95ZEJYbHY6YW3hGdWdrAFojWQywTcBc+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YWzr6j2p; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YWzr6j2p" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso22960565e9.3 for ; Fri, 28 Mar 2025 10:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743181406; x=1743786206; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ri9PCJXsCOzURLlVbX1fPSc/GQL94KYQsCCsTgfwmnE=; b=YWzr6j2pHxpyPu3UW2ujnTr1MhPWaYRlWSCO0BZ2PKEK2j/zvIsHo/qNjUrW+1/BBl RVJ87HRp1SQ/IcXGgjEXLfeRezdiR6E+B/AFQY7yjKe8xrUnBnz8xw6WSAJBea6Y7WYK TjRXKLQXYbZ48dV6WgtEjyQOP+h2T1wiL5mX+LolU6ifryIO7kz9qeDJg53Hnji/lndm M5wm/KC0t3piOckB/amnujuA4utXHB31W5Gy9A6H7bdIACL4ci5ovV9X4US7q4dlzuk8 7HZFOPEKmaJp6QuIbR6Tw3LAvXDu+4iKagcnNNopmbQ4iuBn2neTgFX3gCevH9X58+zI 0OpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743181406; x=1743786206; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ri9PCJXsCOzURLlVbX1fPSc/GQL94KYQsCCsTgfwmnE=; b=pCe/jXZVk9D/hI+kJMOYMyrUJKtp6hY9X5UigvOb9/Q6YMSscdmRM3/kNK1QAcxw7q GEMeA6W7zis7f7cl7t0BIvLEh2v6iIGXQzqf4r1XhPJWzSI7W/C5coFufe0JN1bm8vqE ziJ9HdTe/GUVsvfL6HyE94wiUJ8eqnuo6dKx/Es85Ahg4rUvhgV200JyF9hMZFz2pAuk t3Z1tJNu7CiRvXWIQWTk1YeQM0VD5MmPQqP02WR5FXTZbpX1znSXVnE8NKZ1MpL7Gn6v gyIQ4dV1JIJx35b7VW1XUwH7ZONwBfo9fyfMp+G1BU2BoSAXtzTi1vDCadcxM0qNjQt5 vshg== X-Gm-Message-State: AOJu0YyYNYHt5BxFZRSSZJU4TaZZDKhknbV/v2n+AQ/J8f/EzRfGKxzl 1RQ3bl5bM/3huelbNwe+QRFOHZ0SyqZUaje0PIJWfao/eDjLS81rqSexkw== X-Gm-Gg: ASbGncsbBwMsHsDyZ167gaetH0I4NK0XTB8iKJyx70YQa/YlNrzSSMtbRtv6G2CVgMI pOPVpgBS9Ibi1OOGOq9PAwd/5+dFbrFmdm8TvCqM4zZQ8Wd5r3xbzdkoNXq7hnJNz0dNt5hIDGF uC01yR6ksp4meN++cZCnW68gmJtYAJBwP4sgOYgFF/cYfg5sBYayYrZB+WOCP4ScGxrAObIvFuX ss6eLBqORqjjTdHDCbka5q6ge7PmCiG1chaCbOwjSZzr66kJpPEAtdHhTS2Kf6K+uhfk4cgb9yj suts1DCEXJGHBaTOn8eI0ubDlLh3Lp0HzaOqCxrO4KzxFA== X-Google-Smtp-Source: AGHT+IHC147nW3SIkjUzWpHigSD/9nAUb4ZZcHWpbqGnAMGQwDfllRJiTmtBEA8UOEJ+X/lLnJgDeQ== X-Received: by 2002:a05:600c:4f82:b0:43c:f689:88ce with SMTP id 5b1f17b1804b1-43db62b75c6mr1983895e9.20.1743181405609; Fri, 28 Mar 2025 10:03:25 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b7a422dsm3172883f8f.93.2025.03.28.10.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:03:24 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 28 Mar 2025 17:03:20 +0000 Subject: [PATCH 2/3] wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Johannes Schindelin , Philippe Blain , Philippe Blain From: Philippe Blain From: Philippe Blain When "git status" is invoked during a rebase, we print the last commands done and the next commands to do, and abbreviate commit hashes found in those lines. However, we only abbreviate hashes in 'pick', 'squash' and plain 'fixup' lines, not those in 'merge -C' and 'fixup -C' lines, as the parsing done in wt-status.c::abbrev_oid_in_line is not prepared for such lines. Improve the parsing done by this function by special casing 'fixup' and 'merge' such that the hash to abbreviate is the string found in the third field of 'split', instead of the second one for other commands. Introduce a 'hash' strbuf pointer to point to the correct field in all cases. Signed-off-by: Philippe Blain --- wt-status.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/wt-status.c b/wt-status.c index 1da5732f57b..d11d9f9f142 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1342,9 +1342,11 @@ static int split_commit_in_progress(struct wt_status *s) /* * Turn - * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message" + * "pick d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some message" and + * "merge -C d6a2f0303e897ec257dd0e0a39a5ccb709bc2047 some-branch" * into - * "pick d6a2f03 some message" + * "pick d6a2f03 some message" and + * "merge -C d6a2f03 some-branch" * * The function assumes that the line does not contain useless spaces * before or after the command. @@ -1360,20 +1362,31 @@ static void abbrev_oid_in_line(struct strbuf *line) starts_with(line->buf, "l ")) return; - split = strbuf_split_max(line, ' ', 3); + split = strbuf_split_max(line, ' ', 4); if (split[0] && split[1]) { struct object_id oid; - + struct strbuf *hash; + + if ((!strcmp(split[0]->buf, "merge ") || + !strcmp(split[0]->buf, "m " ) || + !strcmp(split[0]->buf, "fixup ") || + !strcmp(split[0]->buf, "f " )) && + (!strcmp(split[1]->buf, "-C ") || + !strcmp(split[1]->buf, "-c "))) { + hash = split[2]; + } else { + hash = split[1]; + } /* * strbuf_split_max left a space. Trim it and re-add * it after abbreviation. */ - strbuf_trim(split[1]); - if (!repo_get_oid(the_repository, split[1]->buf, &oid)) { - strbuf_reset(split[1]); - strbuf_add_unique_abbrev(split[1], &oid, + strbuf_trim(hash); + if (!repo_get_oid(the_repository, hash->buf, &oid)) { + strbuf_reset(hash); + strbuf_add_unique_abbrev(hash, &oid, DEFAULT_ABBREV); - strbuf_addch(split[1], ' '); + strbuf_addch(hash, ' '); strbuf_reset(line); for (i = 0; split[i]; i++) strbuf_addbuf(line, split[i]); From patchwork Fri Mar 28 17:03:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 14032259 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CE3C1DC992 for ; Fri, 28 Mar 2025 17:03:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181411; cv=none; b=NQJnqWDU0QFsAsSsJFudSr0Yr4FWcNR2pFTqPCjoGucpUC5BHyWr8QnVf1Xyh5veDZ7ptx3HCRw1TNHF4ojS5oWmi4zbw5HK7fN2NnlfLnvyyV8hHyQorJhBL9z6czqxkIcuwnzjBrEaQFQRh1LLKM+Warme/svnUhXO4pFBNCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743181411; c=relaxed/simple; bh=iJSx2wq0GPH6xRCOqnCTnpruLLpQL218jvvUXKZBWBU=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=HMdFU0Vw1LbFz/UZxrMtcfRx9MANcColeIdnGddU2su6Dlk7N05RqgITB/NXi1Em94erpdtjf7N9NAABCZOte4k/UM41XhrWrfXraLP3rmfOPbYS8yrYm9VVSHw28pvnkcPsUxJoWBdBs4VU2lEAOR/ydOfvj+aI1EiaNAnw5yU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Yswl3OXR; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yswl3OXR" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso17726435e9.0 for ; Fri, 28 Mar 2025 10:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743181407; x=1743786207; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=NVcO5WNA5YawXE9sTKCupacfR231dbsLqQd8Hy8r0u8=; b=Yswl3OXRUmUUZsZEBHV1STDOIz+BeC3DakjYMXf+znnfBKbTpVK+PFBRllsP+6RDnL 6c82WDnFQPp8bgcjrjeh/zwWJ5BBfEE/TJAXrQDQWGkxl9ADI9mErHx7ICv1e7/k1m1K cRbWg34t8ndeEXdEFZ2ej7NmVM5cRiw07N2thCqDXi3iNmGjEOXyu9Tgqy6TTSekJ5FC 7RNXdfp1F0Oah1Cc+KmkYKdvU2vsUY1VZiUIvu0AbcoE3gZrBaEKowgIDMgCU18TLvzW 7hN+nnGWYYKLrRc8a3J5urdG13z7OrGQVxHbePTDAVhYa6ZvHjWrN0wTG66a6hY79fSE eKyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743181407; x=1743786207; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NVcO5WNA5YawXE9sTKCupacfR231dbsLqQd8Hy8r0u8=; b=detZFJPYbqBmVg42jTx3xQn/aywJBvMYuzKCx+KF72kPqpn/yeEVW8ITGAbpqfLat4 ID2GZRXr5A0o/8WMI+/3y74AfpBn0+NjuO03HNmT1k29k/FH2ONpn5yTKHyJIHqXlV+D F65mkncDaqqYsISGxbe39vsOG10okrgRYKpL52kvko+Yhf4t9g70xGz1ttUoAbWX898/ OmPUY+CiCPOsOOWZIUuj568nKQHCtsja8Xy7NRxIP1EsfGtl/O2IL1RqtSFSU79G6nqe 8vmjTiDOtrMm9bWR+bQgc6eLszVKZ/Ih5bgTWb7Tepb7PIeqRNdkPaPBhSAO3ZbG1kLJ fnhw== X-Gm-Message-State: AOJu0Yz+kXMAIRXtoCecOGCE4U3GcORBWB5Pvg7yD3m9YS2X9pyaDCVJ c4nnRSQ+YsOwOwkuvKYV6/VOTudJwIGOH0vF3CCGP3Xgd+M/3+DiMW3jkQ== X-Gm-Gg: ASbGnctJU8pnCdgl3UHe5VIUlAvy0BuLYr8s2U49c9fZ3e3ao2vk0Hp2MzdwNx96yQj pHBuPUu4bD+3EXVdEBHaRKqNUUD7ysZrwrTbJqtR51L7eKsmHz1ZNQDlri/RunpxECHyTud36jL 3Zatdstjfwu7rDvEgDegSmUNLTpThTol1ih4UgE/X3zGP1Thx4s8kl+xc62gYbelgTpNL7T7wkq Fq3c1rVMeCgpTtnez8OxpFmRYW2dlbGHB73ceO7c2nhZSFJYRlm8vho0DTy6Bsf/8mYRlDcedgH xJ4hpCltMWG/GdtWTaCWFxZsJ79HTZa9TWumMQXEqmrHgw== X-Google-Smtp-Source: AGHT+IF/eKKai+00Tt4YII5TltODHcvjQM/HumxVJ/aQrghuw7W8/fgtH6458m/im/oiueew0xImsw== X-Received: by 2002:a05:600c:46d0:b0:43d:7588:667b with SMTP id 5b1f17b1804b1-43db62264d4mr2820155e9.10.1743181406698; Fri, 28 Mar 2025 10:03:26 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d900013afsm33505115e9.36.2025.03.28.10.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:03:26 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 28 Mar 2025 17:03:21 +0000 Subject: [PATCH 3/3] wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Johannes Schindelin , Philippe Blain , Philippe Blain From: Philippe Blain From: Philippe Blain Since 982288e9bd (status: rebase and merge can be in progress at the same time, 2018-11-12), when a merge is in progress as part of a 'git rebase -r' operation, 'wt_longstatus_print_state' shows information about the in-progress rebase (via show_rebase_information), and then calls 'show_merge_in_progress' to help the user conclude the merge. This function suggests using 'git commit' to do so, but this throws away the authorship information from the original merge, which is not ideal. Using 'git rebase --continue' instead preserves the authorship information, since we enter 'sequencer.c:run_git_commit' which calls read_env_script to read the author-script file. Note however that this only works when a merge was scheduled using a 'merge' instruction in the rebase todo list. Indeed, when using 'exec git merge', the state files necessary for 'git rebase --continue' are not present, and one must use 'git commit' (or 'git merge --continue') in that case. Be more helpful to the user by suggesting either 'git rebase --continue', when the merge was scheduled using a 'merge' instruction, and 'git commit' otherwise. As such, add a 'merge_during_rebase_in_progress' field to 'struct wt_status_state', and detect this situation in wt_status_check_rebase by looking at the last command done. Adjust wt_longstatus_print_state to check this field and suggest 'git rebase --continue' if a merge came from a 'merge' instruction, by calling show_rebase_in_progress directly. Add two tests for the new behaviour, using 'merge' and 'exec git merge' instructions. Signed-off-by: Philippe Blain --- t/t7512-status-help.sh | 75 ++++++++++++++++++++++++++++++++++++++++++ wt-status.c | 18 +++++++--- wt-status.h | 1 + 3 files changed, 90 insertions(+), 4 deletions(-) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 802f8f704c6..b37e99625b4 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -183,6 +183,81 @@ EOF test_cmp expected actual ' +test_expect_success 'status during rebase -ir after conflicted merge (exec git merge)' ' + git reset --hard main && + git checkout -b rebase_i_merge && + test_commit unrelated && + git checkout -b rebase_i_merge_side && + test_commit side2 main.txt && + git checkout rebase_i_merge && + test_commit side1 main.txt && + PICK=$(git rev-parse --short rebase_i_merge) && + test_must_fail git merge rebase_i_merge_side && + echo side1 >main.txt && + git add main.txt && + test_tick && + git commit --no-edit && + MERGE=$(git rev-parse --short rebase_i_merge) && + ONTO=$(git rev-parse --short main) && + test_when_finished "git rebase --abort" && + FAKE_LINES="1 2 3 5 6 7 8 9 10 exec_git_merge_refs/rewritten/rebase-i-merge-side" && + export FAKE_LINES && + test_must_fail git rebase -ir main && + cat >expect <..." to mark resolution) + both modified: main.txt + +no changes added to commit (use "git add" and/or "git commit -a") +EOF + git status --untracked-files=no >actual && + test_cmp expect actual +' + +test_expect_success 'status during rebase -ir after replaying conflicted merge (merge)' ' + PICK=$(git rev-parse --short :/side1) && + UNRELATED=$(git rev-parse --short :/unrelated) && + MERGE=$(git rev-parse --short rebase_i_merge) && + ONTO=$(git rev-parse --short main) && + test_when_finished "git rebase --abort" && + FAKE_LINES="1 2 3 5 6 7 8 9 10 11 4" && + export FAKE_LINES && + test_must_fail git rebase -ir main && + cat >expect <..." to mark resolution) + both modified: main.txt + +no changes added to commit (use "git add" and/or "git commit -a") +EOF + git status --untracked-files=no >actual && + test_cmp expect actual +' + test_expect_success 'status when rebasing -i in edit mode' ' git reset --hard main && diff --git a/wt-status.c b/wt-status.c index d11d9f9f142..f15495039e3 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1744,6 +1744,7 @@ int wt_status_check_rebase(const struct worktree *wt, struct wt_status_state *state) { struct stat st; + struct string_list have_done = STRING_LIST_INIT_DUP; if (!stat(worktree_git_path(the_repository, wt, "rebase-apply"), &st)) { if (!stat(worktree_git_path(the_repository, wt, "rebase-apply/applying"), &st)) { @@ -1760,8 +1761,12 @@ int wt_status_check_rebase(const struct worktree *wt, state->rebase_interactive_in_progress = 1; else state->rebase_in_progress = 1; + read_rebase_todolist("rebase-merge/done", &have_done); + if (have_done.nr > 0 && starts_with(have_done.items[have_done.nr - 1].string, "merge")) + state->merge_during_rebase_in_progress = 1; state->branch = get_branch(wt, "rebase-merge/head-name"); state->onto = get_branch(wt, "rebase-merge/onto"); + string_list_clear(&have_done, 0); } else return 0; return 1; @@ -1855,10 +1860,15 @@ static void wt_longstatus_print_state(struct wt_status *s) if (state->merge_in_progress) { if (state->rebase_interactive_in_progress) { - show_rebase_information(s, state_color); - fputs("\n", s->fp); - } - show_merge_in_progress(s, state_color); + if (state->merge_during_rebase_in_progress) + show_rebase_in_progress(s, state_color); + else { + show_rebase_information(s, state_color); + fputs("\n", s->fp); + show_merge_in_progress(s, state_color); + } + } else + show_merge_in_progress(s, state_color); } else if (state->am_in_progress) show_am_in_progress(s, state_color); else if (state->rebase_in_progress || state->rebase_interactive_in_progress) diff --git a/wt-status.h b/wt-status.h index 4e377ce62b8..84bedfcd48f 100644 --- a/wt-status.h +++ b/wt-status.h @@ -87,6 +87,7 @@ struct wt_status_state { int am_empty_patch; int rebase_in_progress; int rebase_interactive_in_progress; + int merge_during_rebase_in_progress; int cherry_pick_in_progress; int bisect_in_progress; int revert_in_progress;