From patchwork Tue Oct 27 14:02:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 11861321 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=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 36A30C61DD8 for ; Tue, 27 Oct 2020 18:25:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2F15206E5 for ; Tue, 27 Oct 2020 18:25:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rifWtMuH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1827162AbgJ0SVr (ORCPT ); Tue, 27 Oct 2020 14:21:47 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:37855 "EHLO mail-wr1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753810AbgJ0OCW (ORCPT ); Tue, 27 Oct 2020 10:02:22 -0400 Received: by mail-wr1-f50.google.com with SMTP id w1so2059915wrm.4 for ; Tue, 27 Oct 2020 07:02:21 -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=CqgeSwdqhwOSvCNIRh1cheA6qPmFRC6+n289G0EFRpo=; b=rifWtMuHs1PcxhQFY4EBH9mgXmuQy0Pn/LQ4QNb5Rd1/zgyVVip67x89unviMDboC1 C70BwSOL3BiMtbdUhI/u/9JG71ivHXD3wMmC8bqDqgGMBEaXOKYc3B6Ey/b1EWTXIuQ0 NjUD1yy9Uq4+wD50+mtVicsXb1zyasL3hyEAni2n5oqMNWqVqw+MN3PJmY74y6gc/WGe XuhHoWXafRIcyD5LmYhCVBwEa+Vggkcz5nyrRFWk5SgyLz6NFozoERRV1ge8GUYQqyku XDp8wovkX69DZFwIes0CheH070k9qkmF+oB/6kKs2KgxxhOFPhUsbGguDYoJ4I2OHzcj 88dw== 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=CqgeSwdqhwOSvCNIRh1cheA6qPmFRC6+n289G0EFRpo=; b=h8Kdtgf83Nj3VH3CHCQmNf6F4L56/nvDNs8XV5NDamFxwBZe/JsUF9nwJ8UaVYMPW4 BipAgRFxel0DIS0K5/1NSW3AdP7DiGPdAntRS2H6wGPWdRu9krum2zhU27YqCWf9wkXA 2Npd8Z3/kEcp9SnntzeGoq2fnRi4kBVxz0WHugRCYbtiUpuPvrl9Epol55dNDL9SCOnQ QIpOmt/EK89d6Yj4zz68T01S2P1WupfPnsKEuzaMAvf9jVHMpSB7SRH9/Aqf/K68zZSZ NjNP1DU2mS9kyLSCidzJLvGfCVwqQFrnsBjfBvT22i8Tz26OP2H0EO+BPLP+vXJIIJ41 wzsQ== X-Gm-Message-State: AOAM5310mLemhtg8iqTma6Fr9gfNcymJpig1ZvEH6o2W/s2Ojq0wq3jq NFVSVTMJuNBTq/x/BM956asJMnobJ3E= X-Google-Smtp-Source: ABdhPJxYFIztrL8zRQOUvUQOdhJ68S/LbVgzc1D+8oQo1cxk7nfEJ+fwsG5NHbklydRroTSkkjrnWw== X-Received: by 2002:adf:e849:: with SMTP id d9mr3317980wrn.25.1603807340184; Tue, 27 Oct 2020 07:02:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u195sm2340823wmu.18.2020.10.27.07.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 07:02:19 -0700 (PDT) Message-Id: <24f2c4a62317231f4eabed23bb24d345abc9d67e.1603807338.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 27 Oct 2020 14:02:14 +0000 Subject: [PATCH 1/4] rebase -i: stop overwriting ORIG_HEAD buffer Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Caspar Duregger , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood From: Phillip Wood After rebasing ORIG_HEAD is supposed to point to the old HEAD of the rebased branch. Unfortunately the buffer storing the oid was overwritten with a new oid before ORIG_HEAD was created. The buffer is also used when writing .git/rebase-merge/orig-head which is used by `rebase --abort` to restore the previous head. Luckily that file is written before the buffer is overwritten. As we want the full oid find_unique_abbrev() is replaced with oid_to_hex_r() rather than find_unique_abbrev_r(). I think that all of the users of head_hash should actually be using opts->orig_head instead as passing a string rather than a struct object_id around is a hang over from the scripted implementation. This patch just fixes the immediate bug and adds a regression test based on Caspar's reproduction example. The users will be converted to use struct object_id and head_hash removed in the next few commits. Reported-by: Caspar Duregger Signed-off-by: Phillip Wood --- builtin/rebase.c | 10 +++++----- t/t3404-rebase-interactive.sh | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index eeca53382f..6def28a533 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -270,15 +270,15 @@ static int edit_todo_file(unsigned flags) } static int get_revision_ranges(struct commit *upstream, struct commit *onto, - struct object_id *orig_head, const char **head_hash, + struct object_id *orig_head, char *head_hash, char **revisions, char **shortrevisions) { struct commit *base_rev = upstream ? upstream : onto; const char *shorthead; - *head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ); + oid_to_hex_r(head_hash, orig_head); *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid), - *head_hash); + head_hash); shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV); @@ -327,7 +327,7 @@ static void split_exec_commands(const char *cmd, struct string_list *commands) static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) { int ret; - const char *head_hash = NULL; + char head_hash[GIT_MAX_HEXSZ]; char *revisions = NULL, *shortrevisions = NULL; struct strvec make_script_args = STRVEC_INIT; struct todo_list todo_list = TODO_LIST_INIT; @@ -335,7 +335,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) struct string_list commands = STRING_LIST_INIT_DUP; if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, - &head_hash, &revisions, &shortrevisions)) + head_hash, &revisions, &shortrevisions)) return -1; if (init_basic_state(&replay, diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 07a1617351..1e56696e4f 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1797,6 +1797,17 @@ test_expect_success 'todo has correct onto hash' ' test_i18ngrep "^# Rebase ..* onto $onto" actual ' +test_expect_success 'ORIG_HEAD is updated correctly' ' + test_when_finished "git checkout master && git branch -D test-orig-head" && + git checkout -b test-orig-head A && + git commit --allow-empty -m A1 && + git commit --allow-empty -m A2 && + git commit --allow-empty -m A3 && + git commit --allow-empty -m A4 && + git rebase master && + test_cmp_rev ORIG_HEAD test-orig-head@{1} +' + # This must be the last test in this file test_expect_success '$EDITOR and friends are unchanged' ' test_editor_unchanged From patchwork Tue Oct 27 14:02:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 11861323 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=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 BDFD4C63777 for ; Tue, 27 Oct 2020 18:25:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 756C220773 for ; Tue, 27 Oct 2020 18:25:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Busj39v5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1827171AbgJ0SVy (ORCPT ); Tue, 27 Oct 2020 14:21:54 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37156 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753811AbgJ0OCX (ORCPT ); Tue, 27 Oct 2020 10:02:23 -0400 Received: by mail-wr1-f68.google.com with SMTP id w1so2059999wrm.4 for ; Tue, 27 Oct 2020 07:02:22 -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=qJ+aTUDBZYP1HQbTAMXG2iRa0Q9j/4pzu9dS15D1wYs=; b=Busj39v5UvJKN4Czwp45b9BTJh0ogHCR0rYnzg5UUZwyhxcXYbx7lgOmocWEnNAIl3 eG2v6FSlIFJDP/MSOpG1uDd3nbVZ8l8a9eHrLa+rj8Q8DOBCeJ27ZiJKx4MueEf8CWNv 1ZWG5VmpmTvWB6HS10h0GLesoH7hnvyDKVdoKqK1AYDIRlXflqyAfMlG3LC6EcHCU1x+ gns8CvHOJhneRqMkYtlZZV57mZXR1o/2La5eKEU0ppIHuM+wumsFiyKmAf+e4xwXadNS Kwn7TCtrTewSv4lS1/UKh/Er3Aw7rE/FuUF85WZRTM6I0DoTSR6Ab+D8MdTve0WmCNGA A3gg== 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=qJ+aTUDBZYP1HQbTAMXG2iRa0Q9j/4pzu9dS15D1wYs=; b=iXVp28fItG7MHDatJHw9eM8EMqMLie1GOXw4dEaIQXwMZ360+yD8tMmmvdtK6vBBlE w+CMMytsk92juLlI8BWHGxJ1Ost5/eJeawFaKScgxijzj7zLfjt8PBOeyOVE553HT12g Eea6Y8dJYCRPc1SyquAfDsZAcFvxWqab/TgyWMcs3xnqMGnNH7qBfwLerfy5VXrs4IsR xf9vHeR/lMTMWsa5vsXsr0ie9hASXWBNicXKzCidPCc945MZ2X900eHkZpdWbwnbKmKe o0QCW+REcz5QcyblSk+LaJs14soFyZLhoW8ubCqYznYMcdYzbgBfkVMVrMR43kKweUiD gtmg== X-Gm-Message-State: AOAM531SHUh6Cw0aQ8Nn8utP8sut/e5olBpGEdxaqsR6NCFPuIhqYiLG v9pwpj0G8rEIPlVae7SbzVC4MjIq9ls= X-Google-Smtp-Source: ABdhPJze9zY8ToPbmQb3CcavM/U95yfLRPz6OhIUEtRRRBK9QimZHp2Z1wpIlBJ2/R7gc6n3bsxUJQ== X-Received: by 2002:a5d:4f0b:: with SMTP id c11mr3015636wru.316.1603807341098; Tue, 27 Oct 2020 07:02:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d20sm2200976wra.38.2020.10.27.07.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 07:02:20 -0700 (PDT) Message-Id: <589aed08f18c50979c210ca97c6dc0a01eac76c3.1603807338.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 27 Oct 2020 14:02:15 +0000 Subject: [PATCH 2/4] rebase -i: use struct object_id rather than looking up commit Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Caspar Duregger , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood From: Phillip Wood We already have a struct object_id containing the oid that we want to set ORIG_HEAD to so use that rather than converting it to a string and then calling get_oid() on that string. Signed-off-by: Phillip Wood --- builtin/rebase.c | 5 +++-- sequencer.c | 10 +++------- sequencer.h | 5 +++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 6def28a533..d975918de6 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -370,8 +370,9 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) split_exec_commands(opts->cmd, &commands); ret = complete_action(the_repository, &replay, flags, - shortrevisions, opts->onto_name, opts->onto, head_hash, - &commands, opts->autosquash, &todo_list); + shortrevisions, opts->onto_name, opts->onto, + &opts->orig_head, &commands, opts->autosquash, + &todo_list); } string_list_clear(&commands, 0); diff --git a/sequencer.c b/sequencer.c index 00acb12496..f79c3df861 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3965,21 +3965,17 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts, static int checkout_onto(struct repository *r, struct replay_opts *opts, const char *onto_name, const struct object_id *onto, - const char *orig_head) + const struct object_id *orig_head) { - struct object_id oid; const char *action = reflog_message(opts, "start", "checkout %s", onto_name); - if (get_oid(orig_head, &oid)) - return error(_("%s: not a valid OID"), orig_head); - if (run_git_checkout(r, opts, oid_to_hex(onto), action)) { apply_autostash(rebase_path_autostash()); sequencer_remove_state(opts); return error(_("could not detach HEAD")); } - return update_ref(NULL, "ORIG_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR); + return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR); } static int stopped_at_head(struct repository *r) @@ -5314,7 +5310,7 @@ static int skip_unnecessary_picks(struct repository *r, int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, const char *shortrevisions, const char *onto_name, - struct commit *onto, const char *orig_head, + struct commit *onto, const struct object_id *orig_head, struct string_list *commands, unsigned autosquash, struct todo_list *todo_list) { diff --git a/sequencer.h b/sequencer.h index b2a501e445..ea56825488 100644 --- a/sequencer.h +++ b/sequencer.h @@ -163,8 +163,9 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands); int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, const char *shortrevisions, const char *onto_name, - struct commit *onto, const char *orig_head, struct string_list *commands, - unsigned autosquash, struct todo_list *todo_list); + struct commit *onto, const struct object_id *orig_head, + struct string_list *commands, unsigned autosquash, + struct todo_list *todo_list); int todo_list_rearrange_squash(struct todo_list *todo_list); /* From patchwork Tue Oct 27 14:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 11861313 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=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 1C2B7C388F9 for ; Tue, 27 Oct 2020 18:24:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B54B520773 for ; Tue, 27 Oct 2020 18:24:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iqpAWhE6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1827192AbgJ0SWC (ORCPT ); Tue, 27 Oct 2020 14:22:02 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:37910 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753812AbgJ0OCY (ORCPT ); Tue, 27 Oct 2020 10:02:24 -0400 Received: by mail-wr1-f49.google.com with SMTP id n18so2052841wrs.5 for ; Tue, 27 Oct 2020 07:02:22 -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=S6HMBHnVySI2rqEgBg3+alOlWIeaRuyc4pqh+3dqsIo=; b=iqpAWhE6SKTjx5wWxksBwYVAZFwLshED81tqkzcPRPav6FO8+vgpNaYO35GmLzjc76 FWqsTPFkIHEBekQIoGTtyeIL7uFzk6vH2kMftoWV0XaEDhsIIaoOoyHV4Fn2u82fyEwo qia49YCRUavgWwwArnSXG3RGb7wv4/2nE6AQcjasm3+IPkDjLaGA74X767aeuF8x0iZO 5nohGHeysL35SAqCoeHVa5dmZy7wQHbuATwVUWv4Fk3ecSw47miqUq5p0trkFxLMqAXO w46DgT6LmwAUmxc8oq6CJCHfRVDnGWg/n0GDXrRFepSWa6F7gxJvm9M3P8UiuKky2XGJ j4Qg== 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=S6HMBHnVySI2rqEgBg3+alOlWIeaRuyc4pqh+3dqsIo=; b=MS/ail8EM8YW6FTEypkcdNhbWZYOaeGONoW3QO21ua7TE6hslJQlpz+XA9BO82Qbso jT2V2VkeGx+JDyU8jxjWGeQCfm/9QxSi/YOU+LueSODW/gQZIv69KExCe3GW1H+m078i ei/i82TnRz0dXI1xKb5B5EwsAqvKyMAd5G63Sj/JOaoljqD3WNeUKBXpHC8ThpAiASlK jzPi70mq30e2kvR6SxTImVnJ95YFS3v5CCTOSxolXOUCg8thiR0XKySu4GJM5ITJjaGN xe68NiEJVxHhbs55QKSXllc5SKSP9s991oxHcRfIRf6npNdb20ET/aPqiCkh8nnuAJev OZqQ== X-Gm-Message-State: AOAM531oaHkL3XNPw973an0+yYlcpiKKNXMbD1gHArzaU6YN+UQZmgK2 b/1uHv0luBrzlILmfm/xE5k15+087X4= X-Google-Smtp-Source: ABdhPJz5M4s3Ieheb2INCWTjbMJFEsyVo9U2iLDU5C7Fec/48949Fm9Zx23yfw6HXe9BoxZW9ANymQ== X-Received: by 2002:adf:fc8b:: with SMTP id g11mr3107788wrr.300.1603807342018; Tue, 27 Oct 2020 07:02:22 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e7sm2376021wrm.6.2020.10.27.07.02.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 07:02:21 -0700 (PDT) Message-Id: <11494a7b79cd5b6fbef51720e7111a94e7bd650e.1603807338.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 27 Oct 2020 14:02:16 +0000 Subject: [PATCH 3/4] rebase -i: use struct object_id when writing state Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Caspar Duregger , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood From: Phillip Wood Rather than passing a string around pass the struct object_id that the string was created from call oid_hex() when we write the file. Signed-off-by: Phillip Wood --- builtin/rebase.c | 3 ++- sequencer.c | 5 +++-- sequencer.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index d975918de6..f94f9fe307 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -296,7 +296,8 @@ static int get_revision_ranges(struct commit *upstream, struct commit *onto, } static int init_basic_state(struct replay_opts *opts, const char *head_name, - struct commit *onto, const char *orig_head) + struct commit *onto, + const struct object_id *orig_head) { FILE *interactive; diff --git a/sequencer.c b/sequencer.c index f79c3df861..2037f0ba66 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2692,7 +2692,7 @@ static void write_strategy_opts(struct replay_opts *opts) } int write_basic_state(struct replay_opts *opts, const char *head_name, - struct commit *onto, const char *orig_head) + struct commit *onto, const struct object_id *orig_head) { if (head_name) write_file(rebase_path_head_name(), "%s\n", head_name); @@ -2700,7 +2700,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name, write_file(rebase_path_onto(), "%s\n", oid_to_hex(&onto->object.oid)); if (orig_head) - write_file(rebase_path_orig_head(), "%s\n", orig_head); + write_file(rebase_path_orig_head(), "%s\n", + oid_to_hex(orig_head)); if (opts->quiet) write_file(rebase_path_quiet(), "%s", ""); diff --git a/sequencer.h b/sequencer.h index ea56825488..cf201f2406 100644 --- a/sequencer.h +++ b/sequencer.h @@ -227,7 +227,7 @@ int read_author_script(const char *path, char **name, char **email, char **date, int allow_missing); void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, - struct commit *onto, const char *orig_head); + struct commit *onto, const struct object_id *orig_head); void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); From patchwork Tue Oct 27 14:02:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 11860521 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=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 E9875C55179 for ; Tue, 27 Oct 2020 14:02:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B361022258 for ; Tue, 27 Oct 2020 14:02:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C/K5yZFI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753188AbgJ0OC3 (ORCPT ); Tue, 27 Oct 2020 10:02:29 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33130 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753817AbgJ0OC0 (ORCPT ); Tue, 27 Oct 2020 10:02:26 -0400 Received: by mail-wr1-f65.google.com with SMTP id b8so2086280wrn.0 for ; Tue, 27 Oct 2020 07:02:23 -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=rVLSZ08PoAMbu5DUrshvpmANiqYNkyELjnoBHDServo=; b=C/K5yZFIDxMZzBNnKWFvZxaabtVLlADtrDfgPG6pfAvv6xXR/NALqPeJr4G8aVZ6Ty Ot/VCEMwnAIQRCw5KGIC8jH8A+cFrOuBmWP/RhPxwF5lYdybF4H0GqvCdcKpm/D7xSMZ W7jKFrNSRQ4lm8zuDZpUr7NzChlFejrNPSTV0sCzgqm+XJWGr4kNWCjvtbMoIh1odbSr nuqRDBJE1SKdH0fNnFhKyKcNXe5DHox/jcIVIqS5txTJ45CwowMXof7Cr8SVOLhAoToD mZuQqLZ8cUizfCg0wyRZzxasOHoBDU7jQ0zTh+wCCsGFGot8wtmjDXA3vUPMBoQRYEEb 48xA== 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=rVLSZ08PoAMbu5DUrshvpmANiqYNkyELjnoBHDServo=; b=be5fcCj6SRKbUrXYgAg4pudjRo2tEF3rpm9Hbyp3NRm4ZkVVhfTXNj+xMOhwGZ106D ny2Yn80nAxyZegYfEmgA2Fbxr3tEplQf8wRt3oJJn1Ubu5f2eDBe+JXKzBRvqyJ5ajTW 44sAKBXt9yo5dX80BH25iZPOcm0k84kTyM8J9oAD3Ooy7lj3PaZHSiOXIKkDdacXKXlJ ur41BVrAW9DX2eWtwxZRN6/gC8F8Tsb/P8ivUi+lp2SagF91p39/m9ibeIXjsdA8Dloe RP0yzRoZl4l3KKhpUBxnZSwRceeF0iDfaQ3/UfLwy19ADzjEOljw3XMN6IkkPK2jAbql nvyg== X-Gm-Message-State: AOAM533Z8lSt3sPIOjWUptNmlpAzXnShsuK8AX7XAFClrxPSrIOSXZv4 KO1My2sNTh1lT+Go53F2M8r8FhgiJw4= X-Google-Smtp-Source: ABdhPJwh4CWN0rWiDCy/QYdMlUCU8mGDccbH5e0gOkdx1vsrskmFEcRx+t2ZGlvctqFFlGb1Ch+9nw== X-Received: by 2002:adf:f9cf:: with SMTP id w15mr3175829wrr.185.1603807343031; Tue, 27 Oct 2020 07:02:23 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i14sm2056868wml.24.2020.10.27.07.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 07:02:22 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Tue, 27 Oct 2020 14:02:17 +0000 Subject: [PATCH 4/4] rebase -i: simplify get_revision_ranges() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Caspar Duregger , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood From: Phillip Wood Now that all the external users of head_hash have been converted to use a opts->orig_head instead we can stop returning head_hash from get_revision_ranges(). Signed-off-by: Phillip Wood --- builtin/rebase.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index f94f9fe307..17450e9d9e 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -270,15 +270,14 @@ static int edit_todo_file(unsigned flags) } static int get_revision_ranges(struct commit *upstream, struct commit *onto, - struct object_id *orig_head, char *head_hash, - char **revisions, char **shortrevisions) + struct object_id *orig_head, char **revisions, + char **shortrevisions) { struct commit *base_rev = upstream ? upstream : onto; const char *shorthead; - oid_to_hex_r(head_hash, orig_head); *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid), - head_hash); + oid_to_hex(orig_head)); shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV); @@ -328,7 +327,6 @@ static void split_exec_commands(const char *cmd, struct string_list *commands) static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) { int ret; - char head_hash[GIT_MAX_HEXSZ]; char *revisions = NULL, *shortrevisions = NULL; struct strvec make_script_args = STRVEC_INIT; struct todo_list todo_list = TODO_LIST_INIT; @@ -336,12 +334,12 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) struct string_list commands = STRING_LIST_INIT_DUP; if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, - head_hash, &revisions, &shortrevisions)) + &revisions, &shortrevisions)) return -1; if (init_basic_state(&replay, opts->head_name ? opts->head_name : "detached HEAD", - opts->onto, head_hash)) { + opts->onto, &opts->orig_head)) { free(revisions); free(shortrevisions);