From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 1/1] sequencer: fix empty commit check when amending
Date: Tue, 26 Nov 2019 10:11:56 +0900 [thread overview]
Message-ID: <xmqqy2w3wieb.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <43bdadd2-9ea9-4e50-1f47-ec18e0db4794@gmail.com> (Phillip Wood's message of "Mon, 25 Nov 2019 14:23:26 +0000")
Phillip Wood <phillip.wood123@gmail.com> writes:
>>> +test_expect_success 'fixup on orphan branch errors out' '
>>> +
>>> + test_when_finished "git switch master" &&
>>> + write_script switch-branch.sh <<-\EOF &&
>>> + git symbolic-ref HEAD refs/heads/does-not-exist &&
>>> + git rm -rf .
>>
>> That "git rm -rf ." scares me, though.
>
> I know I'm not too keen on it my self but we need to empty the
> worktree and index if we're going to switch to an unborn branch
"checkout --orphan" takes you to an unborn branch. If you need to
also be with no contents in the index and nothing in the working
tree, then "git rm -r ." may be needed, but applying a fixup without
the target content does sound like asking for a conflict already.
prev parent reply other threads:[~2019-11-26 1:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 14:06 [PATCH 0/1] sequencer: fix empty commit check when amending Phillip Wood via GitGitGadget
2019-11-21 14:06 ` [PATCH 1/1] " Phillip Wood via GitGitGadget
2019-11-22 6:40 ` Junio C Hamano
2019-11-22 11:01 ` Phillip Wood
2019-11-22 6:52 ` Junio C Hamano
2019-11-22 11:09 ` Phillip Wood
2019-11-22 19:43 ` [PATCH v2 0/1] " Phillip Wood via GitGitGadget
2019-11-22 19:43 ` [PATCH v2 1/1] " Phillip Wood via GitGitGadget
2019-11-23 2:02 ` Junio C Hamano
2019-11-23 2:03 ` Junio C Hamano
2019-11-23 9:54 ` Phillip Wood
2019-11-24 10:52 ` Phillip Wood
2019-11-25 3:00 ` Junio C Hamano
2019-11-25 14:23 ` Phillip Wood
2019-11-25 15:53 ` Johannes Schindelin
2019-11-25 16:10 ` Eric Sunshine
2019-11-25 22:52 ` Johannes Schindelin
2019-11-25 16:42 ` Phillip Wood
2019-11-26 1:11 ` Junio C Hamano [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy2w3wieb.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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.
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 NNTP newsgroup(s).