From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree()
Date: Thu, 21 Jan 2016 02:27:11 +0100 [thread overview]
Message-ID: <20160121022711.Horde.7Nh0N0fTAbd0JWIA99KKFQF@webmail.informatik.kit.edu> (raw)
In-Reply-To: <xmqqbn8f3iq5.fsf@gitster.mtv.corp.google.com>
Quoting Junio C Hamano <gitster@pobox.com>:
>> +test_expect_success 'error on clean index and worktree while on
>> orphan branch' '
>> + test_when_finished "git checkout master" &&
>> + git checkout --orphan orphan &&
>> + git reset --hard &&
>> + test_must_fail run_require_clean_work_tree
>> +'
>
> The title is wrong. Immediately after creating and getting on an
> orphan branch, you have stuff in the index that is not committed to
> the branch, so your index cannot be clean by definition.
The index contains the file 'file', so it's not clean indeed.
> The
> contents of the working tree may or may not be clean immediately
> after getting on a new orphan branch, but you are doing "reset
> --hard" to make the index and the working tree agree,
... and match HEAD, which in this case means both the index and the
worktree become empty.
'git rm -r .' would have made the intent clearer. Or 'git init emptyrepo'.
> so this is
> testing the "clean working tree" case, I think.
So the question is, before we go any further: are an empty index and
empty worktree clean when HEAD doesn't point to a commit? (either after
the command sequence in the above test, or right after 'git init').
I do think they are clean.
Gábor
next prev parent reply other threads:[~2016-01-21 1:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-24 14:45 [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree() SZEDER Gábor
2015-11-24 14:45 ` [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches SZEDER Gábor
2015-11-24 20:50 ` Jeff King
2015-11-30 12:37 ` SZEDER Gábor
2015-12-02 23:07 ` Junio C Hamano
2015-11-25 6:51 ` Johannes Sixt
2015-11-30 12:24 ` SZEDER Gábor
2016-01-21 0:06 ` Junio C Hamano
2016-01-20 23:59 ` [PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree() Junio C Hamano
2016-01-21 1:27 ` SZEDER Gábor [this message]
2016-01-21 4:52 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160121022711.Horde.7Nh0N0fTAbd0JWIA99KKFQF@webmail.informatik.kit.edu \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).