From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Gábor Lipták" <gabor.liptak@gmail.com>,
"Jens Lehmann" <jens.lehmann@web.de>,
"John Keeping" <john@keeping.me.uk>
Subject: [PATCH] t7800: add a difftool test for .git-files
Date: Wed, 5 Mar 2014 01:23:35 -0800 [thread overview]
Message-ID: <1394011415-99543-1-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <530FAA2D.8060104@web.de>
From: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
This is a replacement patch for the current tip of da/difftool.
t/t7800-difftool.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2418528..986b78e 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -434,4 +434,18 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
)
'
+test_expect_success PERL 'difftool properly honors gitlink and core.worktree' '
+ git submodule add ./. submod/ule &&
+ (
+ cd submod/ule &&
+ test_config diff.tool checktrees &&
+ test_config difftool.checktrees.cmd '\''
+ test -d "$LOCAL" && test -d "$REMOTE" && echo good
+ '\'' &&
+ echo good>expect &&
+ git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
+ test_cmp expect actual
+ )
+'
+
test_done
--
1.8.5.5.2.g42fdfc9
prev parent reply other threads:[~2014-03-05 9:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 3:12 [PATCH] difftool: support repositories with .git-files David Aguilar
2014-02-24 17:55 ` Junio C Hamano
2014-02-24 21:10 ` Jens Lehmann
2014-02-25 18:02 ` Junio C Hamano
2014-02-25 20:34 ` Jens Lehmann
2014-02-25 22:12 ` Junio C Hamano
2014-02-27 21:12 ` Jens Lehmann
2014-03-05 9:23 ` David Aguilar [this message]
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=1394011415-99543-1-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=gabor.liptak@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jens.lehmann@web.de \
--cc=john@keeping.me.uk \
/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 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 NNTP newsgroup(s).