From patchwork Mon Nov 12 11:44:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 10678515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B5CE109C for ; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2942F29EAA for ; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D5C329EB1; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B90729EAA for ; Mon, 12 Nov 2018 11:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729139AbeKLVhZ (ORCPT ); Mon, 12 Nov 2018 16:37:25 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36320 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728302AbeKLVhZ (ORCPT ); Mon, 12 Nov 2018 16:37:25 -0500 Received: by mail-pl1-f196.google.com with SMTP id w24-v6so4254143plq.3 for ; Mon, 12 Nov 2018 03:44:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=TSKHKgv2TzfUvBiYxx9er5v4tnRLDKXojvS9K+o3yqg=; b=TuWlYu+1RxF7//PSfIigpMrez8p72NnpG42obnXzf0BWC16EV/GqPVt5o9LGQSKFz6 k6AdTUSkKCAthEZ5vJltvIuuJoau+51k3JH0XvJhz+3ejYCRAgFDBn/dixg7yb+89HMf GkwNLMtEdAAPRQIm1f9Ghol9pzCxZQ0uhJcILzO1DAqEpcVQhuJyIJAjar+OkQjgR9yL yeY/0MnEkHSz/9RrnbbyCIJnz9o3XTgUQiQSGOPX06+wqgRk7w0PHJCVocvqaRUpFBtv fH44QaEVzkFituSbuzjz6MPr2D1f109hY6rSMDlPofm75I9EXf3YXqupYV71ZE5CyFQ/ CNzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=TSKHKgv2TzfUvBiYxx9er5v4tnRLDKXojvS9K+o3yqg=; b=J3KLmleaEoUcTEQ7tuAoWIdGyhsD8CJe5wiUINvKljtTOBea7iYvV1RWoiDT5IiS0S YMoumBObbpCgwW41JmR7MyE49Uf96PtdNmnzgKkwuqWMQuAbVfafI83s8NpWgZ0FzNgC sO4EaF4Uo3i7u0nQfkk/dtRNUei+IQzco8fK6SaPigbFpRlHVQdVVa1bMvvJLrtlQpFW U8aax4+iAKYN3/uF9M8/IW1APTz90IEFYL0pnt1IwkHpuh2IpEod92Bpg7yy60e+p9CR cTq8/u9fSDQA0ltAeb5z24Q8Bn1DviUku8A2lQ3Sai32nmiumbuBHgTWYfHOlHP93re9 VTKQ== X-Gm-Message-State: AGRZ1gKJQrpwv1AnulEJswE/AHNQ2SxvFTAUS8AwuDjQfl6bxxPXzHOe 3V8JAqO4iNHFjG6ILKzdpJ4IVX/K X-Google-Smtp-Source: AJdET5c0/uw1EpSlCo/ZvSp7nv3X70Lxko0EGaLqwRsYN3A0GmcatebPnKx0V5iqlfnNiIHF+s93ng== X-Received: by 2002:a17:902:66e5:: with SMTP id e92-v6mr624408plk.92.1542023070726; Mon, 12 Nov 2018 03:44:30 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id i189-v6sm18255038pfg.156.2018.11.12.03.44.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 03:44:30 -0800 (PST) Date: Mon, 12 Nov 2018 03:44:30 -0800 (PST) X-Google-Original-Date: Mon, 12 Nov 2018 11:44:24 GMT Message-Id: <28e24d98abad95996b78f346a505171bccfdf547.1542023066.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 1/3] rebase: consolidate clean-up code before leaving reset_head() Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The same clean-up code is repeated quite a few times; Let's DRY up the code some. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 0ee06aa363..e173654d56 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -541,13 +541,15 @@ static int reset_head(struct object_id *oid, const char *action, if (switch_to_branch && !starts_with(switch_to_branch, "refs/")) BUG("Not a fully qualified branch: '%s'", switch_to_branch); - if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) - return -1; + if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) { + ret = -1; + goto leave_reset_head; + } if (!oid) { if (get_oid("HEAD", &head_oid)) { - rollback_lock_file(&lock); - return error(_("could not determine HEAD revision")); + ret = error(_("could not determine HEAD revision")); + goto leave_reset_head; } oid = &head_oid; } @@ -564,32 +566,27 @@ static int reset_head(struct object_id *oid, const char *action, unpack_tree_opts.reset = 1; if (read_index_unmerged(the_repository->index) < 0) { - rollback_lock_file(&lock); - return error(_("could not read index")); + ret = error(_("could not read index")); + goto leave_reset_head; } if (!fill_tree_descriptor(&desc, oid)) { - error(_("failed to find tree of %s"), oid_to_hex(oid)); - rollback_lock_file(&lock); - free((void *)desc.buffer); - return -1; + ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); + goto leave_reset_head; } if (unpack_trees(1, &desc, &unpack_tree_opts)) { - rollback_lock_file(&lock); - free((void *)desc.buffer); - return -1; + ret = -1; + goto leave_reset_head; } tree = parse_tree_indirect(oid); prime_cache_tree(the_repository->index, tree); - if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) + if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) { ret = error(_("could not write index")); - free((void *)desc.buffer); - - if (ret) - return ret; + goto leave_reset_head; + } reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT); strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase"); @@ -622,7 +619,10 @@ static int reset_head(struct object_id *oid, const char *action, UPDATE_REFS_MSG_ON_ERR); } +leave_reset_head: strbuf_release(&msg); + rollback_lock_file(&lock); + free((void *)desc.buffer); return ret; } From patchwork Mon Nov 12 11:44:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 10678517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B07FF14BD for ; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F72129EAA for ; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93CA629EB0; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8191F29EAF for ; Mon, 12 Nov 2018 11:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729164AbeKLVh0 (ORCPT ); Mon, 12 Nov 2018 16:37:26 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:35185 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728667AbeKLVh0 (ORCPT ); Mon, 12 Nov 2018 16:37:26 -0500 Received: by mail-pg1-f195.google.com with SMTP id 32-v6so3980250pgu.2 for ; Mon, 12 Nov 2018 03:44:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=JsIRbTbXKE/XkRkjcllmf+EFZM+L1NFFuqC+iypS11o=; b=T/qF5+v0kSvdtRBW7G+bHsovIg9p10riqocTL1I9vJdTd585ElptCxggHth+82kqgI JQ7RUZdSwc8jkU+PavCkQZahS/UN8u9adnLr3+boMTR43UXrQgBo/SY19Krr1gxhUalI 6y7JNyNX6fdk3HKcWjM7XBGu4CxCHqgK/8AmJX4agV0x1PvVf3FjWZU1qOt3ewonvmEv 6w9kk07lkBWroXCA8lFgtfBld0gQqwKhGeBhLkNaKgDvJGXOn+eGhp5Ogngzk0frRf0e eAewzbGEQfw6X0XLsOdYOCaq7Sx0KDZPlRK8WlzrQ0356OPl2Ehp8itSDY+nRFqP7hmd M33w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=JsIRbTbXKE/XkRkjcllmf+EFZM+L1NFFuqC+iypS11o=; b=pAGBnsPHkskc49zmvUOUPLCWMbJdutAOgkVZ0sEo/PNIWz8a7zNZ1/8Q6CSf5iFKNA sWVigN8ar8A5CRcYYEPjpVPt/u7RvzBSAE+e6hy74Of7QffggjiOuVd2lcbV0X696MUa hyHvHbIZtRZZ4g+1bhUMwnCuSl8FUqcpI90rkm+R/koZW3EWYT5XQm2LNdl82CooaA3F px1JxV7nlDCfSskEBDDEorfMbcdRxq2OcG1OgIDYhoKK2DPhzcpu4PR6zfG2J2MVe454 jnUvDXS4bttAApwA2YB3ecqR6dI61mUUBdIULyOn5Zi38h7vvao1HhP63ADIfdWoW7jX nkog== X-Gm-Message-State: AGRZ1gL1vb5lrY6Hcnx7THg1YPYrFelsESrIHCteFRDnu00MyG2OP7cH JjUvhQ/iacKFWqldBdFzKIo2ouCZ X-Google-Smtp-Source: AJdET5dZJw4T4zXnVqti7XNIez/0p9A8nFF1+RI9a3UBKUqSWkgJ0f6okr9CtluxC+yunVZGAsFK8w== X-Received: by 2002:a62:2ad6:: with SMTP id q205-v6mr584462pfq.152.1542023072018; Mon, 12 Nov 2018 03:44:32 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id t21sm6066823pgg.24.2018.11.12.03.44.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 03:44:31 -0800 (PST) Date: Mon, 12 Nov 2018 03:44:31 -0800 (PST) X-Google-Original-Date: Mon, 12 Nov 2018 11:44:25 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 2/3] rebase: prepare reset_head() for more flags Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Currently, we only accept the flag indicating whether the HEAD should be detached not. In the next commit, we want to introduce another flag: to toggle between emulating `reset --hard` vs `checkout -q`. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index e173654d56..074594cf10 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -522,10 +522,13 @@ finished_rebase: #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION" +#define RESET_HEAD_DETACH (1<<0) + static int reset_head(struct object_id *oid, const char *action, - const char *switch_to_branch, int detach_head, + const char *switch_to_branch, unsigned flags, const char *reflog_orig_head, const char *reflog_head) { + unsigned detach_head = flags & RESET_HEAD_DETACH; struct object_id head_oid; struct tree_desc desc; struct lock_file lock = LOCK_INIT; @@ -1500,8 +1503,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "it...\n")); strbuf_addf(&msg, "rebase: checkout %s", options.onto_name); - if (reset_head(&options.onto->object.oid, "checkout", NULL, 1, - NULL, msg.buf)) + if (reset_head(&options.onto->object.oid, "checkout", NULL, + RESET_HEAD_DETACH, NULL, msg.buf)) die(_("Could not detach HEAD")); strbuf_release(&msg); From patchwork Mon Nov 12 11:44:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 10678519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 912FA109C for ; Mon, 12 Nov 2018 11:44:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F01A29EAA for ; Mon, 12 Nov 2018 11:44:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7355429EB0; Mon, 12 Nov 2018 11:44:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D971829EAA for ; Mon, 12 Nov 2018 11:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729248AbeKLVh2 (ORCPT ); Mon, 12 Nov 2018 16:37:28 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42430 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728667AbeKLVh1 (ORCPT ); Mon, 12 Nov 2018 16:37:27 -0500 Received: by mail-pf1-f194.google.com with SMTP id u10-v6so4204473pfn.9 for ; Mon, 12 Nov 2018 03:44:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=i+WED/9kJxZyHHgtVoxCs5YpUgNx33ATGPyf87x3sIY=; b=AUFjBLpAmSuQn5jXH2MAibF2Y5WqGSvi0ko2lvfy+1MS77mJk65RWrOHElncOWc8f6 RohoaxmfJpB1z7TSlneBE2eEjhrb3Ygx/oai7OEw4aVZBDyB8wlw1KTcjSglpmm9KNAE A/QfQN+7c++SMg17Z/Cg6IvGJYsP8XqlP2sU9uFrMjIwEvKe4Rlzl6R8zrcQnT3lPH3s rv1JQ93O5wcTqnUeOufqkD3CJ04jiBYkQw6Ve5C/OEKOXCYgI0zpZI/2MqyK4kOzGaMP y13YnVYi5WFffhbDKhlsL0pIQwa/l1rl4LYV7XHly38CZzpjhvSUPkH6e/pjShZRrECY b6FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=i+WED/9kJxZyHHgtVoxCs5YpUgNx33ATGPyf87x3sIY=; b=cwl63A3rRaRE4DnebcUd5iFwWrZTVsyFRtP/ZOcCdATeSBJbWZV8MH0FnMO6Flvy+1 kJ6wokpuL5n5lhHPNEz/5NLuoTTe4842IE5/ldoBmBXNzup93wmD+IYy8QOS3p7xeE8t 5EFOYBkqqlwordqESpCikUKe9Vvda6lQBhj2PeWRpqR3PXYQCG2KIDoofijwu5sISFI1 tGMoB+7kULy1OulHCMsyL6i/wSDbfIQ1ru12zF2ubR8gP17MVv7SN27PZwRgAOmAIgdK Wsos2ccLk6FU9/DDC61jL7SGJc4beRy8ZT9EiFM7qRRL5gyIfFOqDEKsBFzoAtBRs/iD 1wLQ== X-Gm-Message-State: AGRZ1gLbE+nw63nJDS2q22qDxn1/rAWgLxw0+QAMBKYrLEpdckOLTq/L OqCL6SiWHkcO5yvSJjftt2cMoRVj X-Google-Smtp-Source: AJdET5eWfWZUFkRdgSPhUx2vHRc0MfmMUjgJyvOdGlSAjAwrS4LZDdk+agDIZxnyPH9+lHpA68B1PQ== X-Received: by 2002:a63:e348:: with SMTP id o8mr540374pgj.158.1542023073376; Mon, 12 Nov 2018 03:44:33 -0800 (PST) Received: from [127.0.0.1] ([40.112.139.188]) by smtp.gmail.com with ESMTPSA id g64-v6sm18380841pfe.37.2018.11.12.03.44.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Nov 2018 03:44:32 -0800 (PST) Date: Mon, 12 Nov 2018 03:44:32 -0800 (PST) X-Google-Original-Date: Mon, 12 Nov 2018 11:44:26 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 3/3] built-in rebase: reinstate `checkout -q` behavior where appropriate Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin When we converted a `git checkout -q $onto^0` call to use `reset_head()`, we inadvertently incurred a change from a twoway_merge to a oneway_merge, as if we wanted a `git reset --hard` instead. This has performance ramifications under certain, though, as the oneway_merge needs to lstat() every single index entry whereas twoway_merge does not. So let's go back to the old behavior. Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 074594cf10..dc78c1497d 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -523,14 +523,16 @@ finished_rebase: #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION" #define RESET_HEAD_DETACH (1<<0) +#define RESET_HEAD_HARD (1<<1) static int reset_head(struct object_id *oid, const char *action, const char *switch_to_branch, unsigned flags, const char *reflog_orig_head, const char *reflog_head) { unsigned detach_head = flags & RESET_HEAD_DETACH; + unsigned reset_hard = flags & RESET_HEAD_HARD; struct object_id head_oid; - struct tree_desc desc; + struct tree_desc desc[2] = { { NULL }, { NULL } }; struct lock_file lock = LOCK_INIT; struct unpack_trees_options unpack_tree_opts; struct tree *tree; @@ -539,7 +541,7 @@ static int reset_head(struct object_id *oid, const char *action, size_t prefix_len; struct object_id *orig = NULL, oid_orig, *old_orig = NULL, oid_old_orig; - int ret = 0; + int ret = 0, nr = 0; if (switch_to_branch && !starts_with(switch_to_branch, "refs/")) BUG("Not a fully qualified branch: '%s'", switch_to_branch); @@ -549,20 +551,20 @@ static int reset_head(struct object_id *oid, const char *action, goto leave_reset_head; } - if (!oid) { - if (get_oid("HEAD", &head_oid)) { - ret = error(_("could not determine HEAD revision")); - goto leave_reset_head; - } - oid = &head_oid; + if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) { + ret = error(_("could not determine HEAD revision")); + goto leave_reset_head; } + if (!oid) + oid = &head_oid; + memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts)); setup_unpack_trees_porcelain(&unpack_tree_opts, action); unpack_tree_opts.head_idx = 1; unpack_tree_opts.src_index = the_repository->index; unpack_tree_opts.dst_index = the_repository->index; - unpack_tree_opts.fn = oneway_merge; + unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge; unpack_tree_opts.update = 1; unpack_tree_opts.merge = 1; if (!detach_head) @@ -573,12 +575,17 @@ static int reset_head(struct object_id *oid, const char *action, goto leave_reset_head; } - if (!fill_tree_descriptor(&desc, oid)) { + if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) { + ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); + goto leave_reset_head; + } + + if (!fill_tree_descriptor(&desc[nr++], oid)) { ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); goto leave_reset_head; } - if (unpack_trees(1, &desc, &unpack_tree_opts)) { + if (unpack_trees(nr, desc, &unpack_tree_opts)) { ret = -1; goto leave_reset_head; } @@ -625,7 +632,8 @@ static int reset_head(struct object_id *oid, const char *action, leave_reset_head: strbuf_release(&msg); rollback_lock_file(&lock); - free((void *)desc.buffer); + while (nr) + free((void *)desc[--nr].buffer); return ret; } @@ -1003,7 +1011,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) rerere_clear(&merge_rr); string_list_clear(&merge_rr, 1); - if (reset_head(NULL, "reset", NULL, 0, NULL, NULL) < 0) + if (reset_head(NULL, "reset", NULL, RESET_HEAD_HARD, + NULL, NULL) < 0) die(_("could not discard worktree changes")); if (read_basic_state(&options)) exit(1); @@ -1019,7 +1028,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (read_basic_state(&options)) exit(1); if (reset_head(&options.orig_head, "reset", - options.head_name, 0, NULL, NULL) < 0) + options.head_name, RESET_HEAD_HARD, + NULL, NULL) < 0) die(_("could not move back to %s"), oid_to_hex(&options.orig_head)); ret = finish_rebase(&options); @@ -1383,7 +1393,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) write_file(autostash, "%s", oid_to_hex(&oid)); printf(_("Created autostash: %s\n"), buf.buf); if (reset_head(&head->object.oid, "reset --hard", - NULL, 0, NULL, NULL) < 0) + NULL, RESET_HEAD_HARD, NULL, NULL) < 0) die(_("could not reset --hard")); printf(_("HEAD is now at %s"), find_unique_abbrev(&head->object.oid,