From: Junio C Hamano Date: Tue, 03 Feb 2009 07:54:28 GMT Subject: Re: [PATCH] builtin-remote: make rm operation safer in mirrored repository Message-ID: <7vy6woc5vv.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20090203072418.GD21367@sigill.intra.peff.net> Jeff King writes: > On Mon, Feb 02, 2009 at 01:40:14PM -0500, Jay Soffian wrote: > >> This version adds a test case. I also noticed that the check I'd added to >> add_branch_for_removal() was generating spurious warnings because I'd added it >> in the wrong place; this version moves the check below the >> remote_find_tracking() checks. > > This version looks fine to me, and I would be OK with it being applied. > > However, I have one small nit. The output produces long lines with a lot > of repeated text (assuming you have multiple matched branches, which is > likely if you have a mirrored setup). So maybe it would be nicer to have > something like: > > warning: non-remote branches were not removed; you can delete them with: > git branch -d master > git branch -d next > git branch -d topic > > which is a little more obvious (to me, anyway), and allows you to cut > and paste if you really did want to delete them. Thanks for a review, and I actually shared that exact nit when I first read the patch. It would be a very good change to collect them in a list and show a single warning at the end (I do not have particular preference about the cut & paste-ability either way myself).