From: Ben Peart <peartben@gmail.com>
To: git@vger.kernel.org
Cc: asottile@umich.edu, benpeart@microsoft.com, gitster@pobox.com,
pclouds@gmail.com, peartben@gmail.com
Subject: [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout
Date: Mon, 21 Jan 2019 14:50:08 -0500 [thread overview]
Message-ID: <20190121195008.8700-3-peartben@gmail.com> (raw)
In-Reply-To: <20190121195008.8700-1-peartben@gmail.com>
From: Ben Peart <benpeart@microsoft.com>
When doing a 'checkout -b' do a full checkout including updating the working
tree when doing the initial checkout. This fixes the regression in behavior
caused by fa655d8411 (checkout: optimize "git checkout -b <new_branch>", 2018-08-16)
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
builtin/checkout.c | 7 +++++++
t/t2018-checkout-branch.sh | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6fadf412e8..9c6e94319e 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -592,6 +592,13 @@ static int skip_merge_working_tree(const struct checkout_opts *opts,
* Remaining variables are not checkout options but used to track state
*/
+ /*
+ * Do the merge if this is the initial checkout
+ *
+ */
+ if (!file_exists(get_index_file()))
+ return 0;
+
return 1;
}
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 6da2d4e68f..c5014ad9a6 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -198,7 +198,7 @@ test_expect_success 'checkout -B to the current branch works' '
test_dirty_mergeable
'
-test_expect_failure 'checkout -b after clone --no-checkout does a checkout of HEAD' '
+test_expect_success 'checkout -b after clone --no-checkout does a checkout of HEAD' '
git init src &&
test_commit -C src a &&
rev="$(git -C src rev-parse HEAD)" &&
--
2.19.1.gvfs.1.16.g9d1374d
next prev parent reply other threads:[~2019-01-21 19:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-01 23:17 Regression `git checkout $rev -b branch` while in a `--no-checkout` clone does not check out files Anthony Sottile
2019-01-02 11:08 ` Duy Nguyen
2019-01-02 16:18 ` Anthony Sottile
2019-01-03 10:04 ` Duy Nguyen
2019-01-03 20:25 ` Junio C Hamano
2019-01-03 20:35 ` Anthony Sottile
2019-01-03 21:51 ` Junio C Hamano
2019-01-03 22:05 ` Anthony Sottile
2019-01-16 14:39 ` Ben Peart
2019-01-18 18:55 ` [PATCH v1 0/2] Fix regression in checkout -b Ben Peart
2019-01-18 18:55 ` [PATCH v1 1/2] checkout: add test to demonstrate regression with checkout -b on initial commit Ben Peart
2019-01-18 19:23 ` SZEDER Gábor
2019-01-18 18:55 ` [PATCH v1 2/2] checkout: fix regression in checkout -b on intitial checkout Ben Peart
2019-01-18 20:00 ` Junio C Hamano
2019-01-19 0:52 ` SZEDER Gábor
2019-01-19 1:26 ` [PATCH v1 0/2] Fix regression in checkout -b Junio C Hamano
2019-01-21 19:50 ` [PATCH v2 " Ben Peart
2019-01-21 19:50 ` [PATCH v2 1/2] checkout: add test to demonstrate regression with checkout -b on initial commit Ben Peart
2019-01-23 17:57 ` SZEDER Gábor
2019-01-21 19:50 ` Ben Peart [this message]
2019-01-22 14:35 ` [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout Johannes Schindelin
2019-01-22 18:42 ` Junio C Hamano
2019-01-22 18:49 ` Jeff King
2019-01-22 18:54 ` [PATCH v2 0/2] Fix regression in checkout -b Junio C Hamano
2019-01-22 19:31 ` Ben Peart
2019-01-23 19:14 ` Junio C Hamano
2019-01-23 20:01 ` [PATCH v3 " Ben Peart
2019-01-23 20:02 ` [PATCH v3 1/2] checkout: add test demonstrating regression with checkout -b on initial commit Ben Peart
2019-01-23 20:02 ` [PATCH v3 2/2] checkout: fix regression in checkout -b on intitial checkout Ben Peart
2019-01-23 21:23 ` [PATCH v3 0/2] Fix regression in checkout -b Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190121195008.8700-3-peartben@gmail.com \
--to=peartben@gmail.com \
--cc=asottile@umich.edu \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).