git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Mikhail Filippov <mikhail@filippov.me>
To: git <git@vger.kernel.org>
Subject: Re: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.
Date: Mon, 12 Sep 2016 14:07:05 +0300	[thread overview]
Message-ID: <1843881473678425@web17m.yandex.ru> (raw)
In-Reply-To: <xmqqeg4q6mw4.fsf@gitster.mtv.corp.google.com>

>>  +test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
>>  + git rm -rf . &&
>>  + git clean -fdqx &&
>>  + rm -rf .git &&
>>  + git init &&
>
> Yuck. This is inherited from existing tests but I think they need
> to be cleaned up. It is not your fault, and it is not in the scope
> of this change.
It's part need for cleanup repository from the previous case.

  parent reply	other threads:[~2016-09-12 11:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-11 20:25 [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout Mikhail Filippov
2016-09-11 23:24 ` Junio C Hamano
2016-09-12  8:38   ` Mikhail Filippov
2016-09-12 11:07   ` Mikhail Filippov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-09-12 11:24 Mikhail Filippov

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=1843881473678425@web17m.yandex.ru \
    --to=mikhail@filippov.me \
    --cc=git@vger.kernel.org \
    /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).