From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: Re: difftool -d symlinks, under what conditions Date: Tue, 12 Mar 2013 21:06:30 +0000 Message-ID: <20130312210630.GF2317@serenity.lan> References: <20130312190956.GC2317@serenity.lan> <20130312194306.GE2317@serenity.lan> <7vfw0073pm.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: David Aguilar , Matt McClure , "git@vger.kernel.org" , Tim Henigan To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Mar 12 22:07:16 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UFWPh-0007uu-Fd for gcvg-git-2@plane.gmane.org; Tue, 12 Mar 2013 22:07:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933469Ab3CLVGn (ORCPT ); Tue, 12 Mar 2013 17:06:43 -0400 Received: from coyote.aluminati.org ([72.9.247.114]:49736 "EHLO coyote.aluminati.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754527Ab3CLVGm (ORCPT ); Tue, 12 Mar 2013 17:06:42 -0400 Received: from localhost (localhost [127.0.0.1]) by coyote.aluminati.org (Postfix) with ESMTP id 862386064D7; Tue, 12 Mar 2013 21:06:41 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at caracal.aluminati.org X-Spam-Flag: NO X-Spam-Score: -2.899 X-Spam-Level: X-Spam-Status: No, score=-2.899 tagged_above=-9999 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham Received: from coyote.aluminati.org ([127.0.0.1]) by localhost (coyote.aluminati.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qgrgaFOcJ6OV; Tue, 12 Mar 2013 21:06:40 +0000 (GMT) Received: from serenity.lan (mink.aluminati.org [10.0.7.180]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by coyote.aluminati.org (Postfix) with ESMTPSA id 38BAB606515; Tue, 12 Mar 2013 21:06:32 +0000 (GMT) Content-Disposition: inline In-Reply-To: <7vfw0073pm.fsf@alter.siamese.dyndns.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Mar 12, 2013 at 01:39:17PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > How about something like "--symlink-all" where the everything in the > > right-hand tree is symlink'd? > > Does it even have to be conditional? What is the situation when you > do not want symbolic links? When you're not comparing the working tree. If we can reliably say "the RHS is the working tree" then it could be unconditional, but I haven't thought about how to do that - I can't see a particularly easy way to check for that; is it sufficient to say "there is no more than one non-option to the left of '--' and '--cached' is not among the options"? John