All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Kevin Willford <kewillf@microsoft.com>,
	git@vger.kernel.org, peff@peff.net, pclouds@gmail.com
Subject: Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.
Date: Sat, 09 Sep 2017 04:04:45 +0900	[thread overview]
Message-ID: <xmqqzia5xb8y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170908185443.GA15081@tor.lan> ("Torsten =?utf-8?Q?B=C3=B6g?= =?utf-8?Q?ershausen=22's?= message of "Fri, 8 Sep 2017 20:54:43 +0200")

Torsten Bögershausen <tboegi@web.de> writes:

>> +test_expect_success 'setup' '
>> +	test_tick &&
>
> Do we need a test_tick here ?

As the test does not check against exact object names, and it does
not create commits, the order among which needs to be tiebroken by
using the committer timestamp, it is not strictly necessary, but I
do not think it would hurt, either.

>
>> +	echo "checkout file" >c &&
>> +	echo "modify file" >m &&
>> +	echo "delete file" >d &&
>> +	git add . &&
>> +	git commit -m "initial commit" &&
>> +	echo "added file" >a &&
>> +	echo "modification of a file" >m &&
>> +	git rm d &&
>> +	git add . &&
>> +	git commit -m "second commit" &&
>> +	git checkout -b endCommit
>> +'
>> +
>> +test_expect_success 'reset when there is a sparse-checkout' '
>> +	echo "/c" >.git/info/sparse-checkout &&
>> +	test_config core.sparsecheckout true &&
>> +	git checkout -b resetBranch &&
>> +	test_path_is_missing m &&
>> +	test_path_is_missing a &&
>> +	test_path_is_missing d &&
>> +	git reset HEAD~1 &&
>> +	test "checkout file" = "$(cat c)" &&
>> +	test "modification of a file" = "$(cat m)" &&
>> +	test "added file" = "$(cat a)" &&
>> +	test_path_is_missing d
>> +'
>> +

  reply	other threads:[~2017-09-08 19:04 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-08 18:00 [PATCH 0/1] reset: fix mixed reset when using sparse-checkout Kevin Willford
2017-09-08 18:00 ` [PATCH 1/1] reset: fix reset when using the sparse-checkout feature Kevin Willford
2017-09-08 18:54   ` Torsten Bögershausen
2017-09-08 19:04     ` Junio C Hamano [this message]
2017-09-08 19:01   ` Junio C Hamano
2017-09-08 20:08     ` Kevin Willford
2017-09-08 19:12   ` Junio C Hamano
2017-09-08 20:02     ` Kevin Willford
2017-09-09  3:18       ` Junio C Hamano
2017-09-09  4:54         ` Kevin Willford
2017-09-11  4:01           ` Junio C Hamano
2017-09-11 11:15             ` Johannes Schindelin
2017-09-12  3:56               ` Junio C Hamano
2017-09-12 20:20                 ` Kevin Willford
2017-09-12 22:29                   ` Jacob Keller
2017-09-12 23:30                     ` Kevin Willford
2017-09-13  1:39                       ` Jacob Keller
2017-09-13 17:09                         ` Kevin Willford
2017-09-13 22:17                         ` Junio C Hamano
2017-09-14 14:26                           ` Kevin Willford
2017-09-15  5:00                             ` Junio C Hamano
2017-09-15 17:21                               ` Kevin Willford
2017-09-15 21:33                                 ` Jacob Keller

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=xmqqzia5xb8y.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kewillf@microsoft.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=tboegi@web.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.