From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Sixt Subject: Re: [PATCH v3 3/4] t7800: modernize tests Date: Fri, 22 Mar 2013 08:13:46 +0100 Message-ID: <514C04AA.6030305@viscovery.net> References: <1361419428-22410-1-git-send-email-davvid@gmail.com> <1361419428-22410-2-git-send-email-davvid@gmail.com> <1361419428-22410-3-git-send-email-davvid@gmail.com> <514985FB.8080806@viscovery.net> <514AB9A5.3050601@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Sitaram Chamarty , Junio C Hamano , git@vger.kernel.org, Jonathan Nieder To: David Aguilar X-From: git-owner@vger.kernel.org Fri Mar 22 08:14:22 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 1UIwBB-0004Z6-NA for gcvg-git-2@plane.gmane.org; Fri, 22 Mar 2013 08:14:22 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933122Ab3CVHNy (ORCPT ); Fri, 22 Mar 2013 03:13:54 -0400 Received: from so.liwest.at ([212.33.55.24]:2267 "EHLO so.liwest.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932464Ab3CVHNx (ORCPT ); Fri, 22 Mar 2013 03:13:53 -0400 Received: from [81.10.228.254] (helo=theia.linz.viscovery) by so.liwest.at with esmtpa (Exim 4.77) (envelope-from ) id 1UIwAc-0007wH-RQ; Fri, 22 Mar 2013 08:13:47 +0100 Received: from [192.168.1.95] (J6T.linz.viscovery [192.168.1.95]) by theia.linz.viscovery (Postfix) with ESMTP id 653B31660F; Fri, 22 Mar 2013 08:13:46 +0100 (CET) User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 In-Reply-To: <514AB9A5.3050601@viscovery.net> X-Spam-Score: -1.0 (-) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Am 3/21/2013 8:41, schrieb Johannes Sixt: > Am 3/20/2013 23:59, schrieb David Aguilar: >> I started digging in and the @worktree_files (aka @worktree above) >> is populated from the output of "git diff --raw ...". >> >> Seeing the "output" filename in "diff --raw" implies that one of the >> tests added "output" to the index somehow. I do not see that >> happening anywhere, though, so I do not know how it would end up in >> the @worktree array if it is not reported by "diff --raw". >> >> >> My current understanding of how it could possibly be open twice: >> >> 1. via the >output redirect >> 2. via the copy() perl code which is fed by @worktree >> >> So I'm confused. Why would we get different results on Windows? > > I tracked down the difference between Windows and Linux, and it is... > > for my $file (@worktree) { > next if $symlinks && -l "$b/$file"; > > ... this line in sub dir_diff. On Linux, we take the short-cut, but on > Windows we proceed through the rest of the loop, And that is likely by design. From the docs: --symlinks --no-symlinks git difftool's default behavior is create symlinks to the working tree when run in --dir-diff mode. Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows. And indeed, we have this initialization: my %opts = ( ... symlinks => $^O ne 'cygwin' && $^O ne 'MSWin32' && $^O ne 'msys', ... ); Can the --dir-diff tests case pass on Cygwin when neither --symlinks nor --no-symlinks is passed? Perhaps the right solution is this: diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index c6d6b1c..19238f6 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -328,14 +328,16 @@ test_expect_success PERL 'setup change in subdirectory' ' git commit -m "modified both" ' -test_expect_success PERL 'difftool -d' ' - git difftool -d --extcmd ls branch >output && +# passing --symlinks helps Cygwin, which defaults to --no-symlinks + +test_expect_success PERL,SYMLINKS 'difftool -d' ' + git difftool -d --symlinks --extcmd ls branch >output && stdin_contains sub output && +test_expect_success PERL,SYMLINKS 'difftool --dir-diff' ' + git difftool --dir-diff --symlinks --extcmd ls branch >output && stdin_contains sub output && +test_expect_success PERL,SYMLINKS 'difftool --dir-diff ignores --prompt' ' + git difftool --dir-diff --symlinks --prompt --extcmd ls branch >output && stdin_contains sub output && + git difftool --dir-diff --symlinks --extcmd ls branch >output && stdin_contains sub