All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matt McCutchen <matt@mattmccutchen.net>
To: Junio C Hamano <gitster@pobox.com>, Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/*
Date: Mon, 08 Feb 2016 17:36:50 -0500	[thread overview]
Message-ID: <1454971010.2511.89.camel@mattmccutchen.net> (raw)
In-Reply-To: <xmqqvb5y6dx2.fsf@gitster.mtv.corp.google.com>

On Mon, 2016-02-08 at 14:22 -0800, Junio C Hamano wrote:
> Matt McCutchen <matt@mattmccutchen.net> writes:
> 
> > I found no evidence of such behavior in the source code.
> > 
> > Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
> > ---
> 
> That was added last year at bcd57cb9 (Documentation/git-clean.txt:
> document that -f may need to be given twice, 2015-02-26).  It would
> be better to know what got changed since then--that is, was the
> additional text unnecessary even back then, or we made changes to
> the system since then and forgot to remove the added text.
> 
> Mikko, is this need to give -f twice still the case?

I know you probably want confirmation from Mikko, but I'll offer my
understanding.  There were two statements added in bcd57cb9:

1. -f may need to be given twice to delete nested worktrees and
embedded repositories.  This is still true.

2. Deletion of submodule repositories under .git/modules is conditional
on -f being given twice.  AFAICT, this was wrong even back then: "git
clean" has never deleted such repositories under any conditions.

My patch is only removing #2.

Matt

  reply	other threads:[~2016-02-08 22:37 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-06 20:34 [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/* Matt McCutchen
2016-02-06 20:25 ` Matt McCutchen
2016-02-08 22:22 ` Junio C Hamano
2016-02-08 22:36   ` Matt McCutchen [this message]
2016-02-08 22:47     ` Mikko Rapeli
2016-02-09  7:55       ` Mikko Rapeli
2016-02-09 17:34         ` Junio C Hamano
2016-02-09 17:40           ` Matt McCutchen
2016-02-08 23:50     ` 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=1454971010.2511.89.camel@mattmccutchen.net \
    --to=matt@mattmccutchen.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mikko.rapeli@iki.fi \
    /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.