From patchwork Fri Aug 21 16:59:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain via GitGitGadget X-Patchwork-Id: 11729997 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 0C97113B1 for ; Fri, 21 Aug 2020 17:00:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0FB4207DE for ; Fri, 21 Aug 2020 17:00:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SCQVas0s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728324AbgHURAw (ORCPT ); Fri, 21 Aug 2020 13:00:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728663AbgHUQ7o (ORCPT ); Fri, 21 Aug 2020 12:59:44 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C57F1C061755 for ; Fri, 21 Aug 2020 09:59:43 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id d16so2554125wrq.9 for ; Fri, 21 Aug 2020 09:59:43 -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=2a22Ji+Lb045nXL4szHp+eaepH/aNbTIVowa/e/T8SY=; b=SCQVas0sLpyuLhnl0Fx12kIW5BA3SHEKDvaX4504J0FN8cXq1ZLpvERKMaMQ8gYczB jUU/WyMo2iLVB77EPMF+nVsuSydnojozgH4oMCIzKXVdowAndnKhbNxEp3VinVIWdLKL X/HKTpgbxJju5DECvk7i16eEKd8MYGk4UO6GgQmrvVjzgNr0vYYnPhc+kop8IwRsdwJ9 sQ7QU6ZjyUJ+myz0SDZFMVyZ9imJL3M/MWt1BYHKW2s7+EIDUBqYMDyZrn35gIsAWcP6 /4rgZh17s0hAHvBUUjWKXExW7BvQ79TVe6u3kMdyY6+IbZZFpc0Ky4rmPjROzeSUddmN hVOA== 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=2a22Ji+Lb045nXL4szHp+eaepH/aNbTIVowa/e/T8SY=; b=GGN+GJC0689PumKexCuWdOzR6kPjMQ+skZYVh2YyinZMDH7zsrfcnlqpA4Z5YTsUAa P7F/TpXcSyz7EgVYytKY7jEGXEJ3mCeFJB37XE/ttndYYL0p7m6kSPg4MTNO7JcBdbeb icyaoT0P+oHkq9uXjfor5F3TpAUAFce9hKSEB4A9meJ62K0H1Q0ZgGi4hSwomiM7qlzy M7A18hdB9qwzU8Uafeux15SyNVbEan4cnv3KaOfb63CUavY9X90JcyiAtMxFWwQ45yRw R4z69xhQMsH9+PnBTWRXZR7AndLD3E3bkck5Ifx5cWI7QhEpaa8V3p+7XwiV4d4jE2IP 9Kig== X-Gm-Message-State: AOAM532F6L49ycjfdcWuM2wTW9OVbpv+pHc9Gu9A/ufFNevAOBTjHGb5 JAxNT+DMaG3ZtxeZ4ZGNPO7xsDlYFkU= X-Google-Smtp-Source: ABdhPJzkSUB6trZYKTdSiXGcsBf5mDL5WzsNLv9iro4d6UVJeKevoEQ7F5IFfqCYpsjOYmNT7PaZHw== X-Received: by 2002:a5d:5383:: with SMTP id d3mr3527703wrv.42.1598029182260; Fri, 21 Aug 2020 09:59:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 145sm7393235wma.20.2020.08.21.09.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 09:59:41 -0700 (PDT) Message-Id: <9ba013664584087edcc3bc7101ef0d207b1f8b7d.1598029177.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Han-Wen Nienhuys via GitGitGadget" Date: Fri, 21 Aug 2020 16:59:37 +0000 Subject: [PATCH v3 4/4] sequencer: treat REVERT_HEAD as a pseudo ref Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys Signed-off-by: Han-Wen Nienhuys --- path.c | 1 - path.h | 8 +++----- sequencer.c | 16 +++++++++------- wt-status.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/path.c b/path.c index 783cc2ae81..7b385e5eb2 100644 --- a/path.c +++ b/path.c @@ -1528,7 +1528,6 @@ char *xdg_cache_home(const char *filename) return NULL; } -REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD") REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG") REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG") REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR") diff --git a/path.h b/path.h index 8941c018a9..e7e77da6aa 100644 --- a/path.h +++ b/path.h @@ -170,7 +170,6 @@ void report_linked_checkout_garbage(void); } struct path_cache { - const char *revert_head; const char *squash_msg; const char *merge_msg; const char *merge_rr; @@ -181,12 +180,11 @@ struct path_cache { const char *shallow; }; -#define PATH_CACHE_INIT \ - { \ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ +#define PATH_CACHE_INIT \ + { \ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ } -const char *git_path_revert_head(struct repository *r); const char *git_path_squash_msg(struct repository *r); const char *git_path_merge_msg(struct repository *r); const char *git_path_merge_rr(struct repository *r); diff --git a/sequencer.c b/sequencer.c index 3f538a0851..d7db076715 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2317,8 +2317,10 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose) need_cleanup = 1; } - if (file_exists(git_path_revert_head(r))) { - if (!unlink(git_path_revert_head(r)) && verbose) + if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { + if (!refs_delete_ref(get_main_ref_store(r), "", "REVERT_HEAD", + NULL, 0) && + verbose) warning(_("cancelling a revert in progress")); opts.action = REPLAY_REVERT; need_cleanup = 1; @@ -2677,7 +2679,7 @@ static int create_seq_dir(struct repository *r) const char *in_progress_error = NULL; const char *in_progress_advice = NULL; unsigned int advise_skip = - file_exists(git_path_revert_head(r)) || + refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") || refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD"); if (!sequencer_get_last_command(r, &action)) { @@ -2778,7 +2780,7 @@ static int rollback_single_pick(struct repository *r) struct object_id head_oid; if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && - !file_exists(git_path_revert_head(r))) + !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) return error(_("no cherry-pick or revert in progress")); if (read_ref_full("HEAD", 0, &head_oid, NULL)) return error(_("cannot resolve HEAD")); @@ -2872,7 +2874,7 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts) */ switch (opts->action) { case REPLAY_REVERT: - if (!file_exists(git_path_revert_head(r))) { + if (!refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { if (action != REPLAY_REVERT) return error(_("no revert in progress")); if (!rollback_is_safe()) @@ -4210,7 +4212,7 @@ static int continue_single_pick(struct repository *r) const char *argv[] = { "commit", NULL }; if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") && - !file_exists(git_path_revert_head(r))) + !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) return error(_("no cherry-pick or revert in progress")); return run_command_v_opt(argv, RUN_GIT_CMD); } @@ -4390,7 +4392,7 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) /* Verify that the conflict has been resolved */ if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") || - file_exists(git_path_revert_head(r))) { + refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) { res = continue_single_pick(r); if (res) goto release_todo_list; diff --git a/wt-status.c b/wt-status.c index c6abf2f3ca..ecbe570e28 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1678,7 +1678,7 @@ void wt_status_get_state(struct repository *r, oidcpy(&state->cherry_pick_head_oid, &oid); } wt_status_check_bisect(NULL, state); - if (!stat(git_path_revert_head(r), &st) && + if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") && !get_oid("REVERT_HEAD", &oid)) { state->revert_in_progress = 1; oidcpy(&state->revert_head_oid, &oid);