From 2b099d8ba0f04dfd1634dfd9e38e1874f5d9f755 Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Wed, 27 Sep 2017 13:03:21 +0100 Subject: [PATCH] Fix up tests to have nested ignored files --- Vagrantfile | 3 +++ xtests/git_2_all | 1 + xtests/git_2_ignoreds | 1 + xtests/git_2_recurse | 5 +++++ xtests/git_2_tree | 5 ++++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 083c08a..02e65a0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -541,6 +541,9 @@ Vagrant.configure(2) do |config| mkdir "ignoreds" touch "ignoreds/music.mp3" touch "ignoreds/music.m4a" + mkdir "ignoreds/nested" + touch "ignoreds/nested/70s grove.mp3" + touch "ignoreds/nested/funky chicken.m4a" mkdir "target" touch "target/another ignored file" diff --git a/xtests/git_2_all b/xtests/git_2_all index cd3bb02..fc0dfa1 100644 --- a/xtests/git_2_all +++ b/xtests/git_2_all @@ -4,6 +4,7 @@ /testcases/git2/ignoreds: .rw-rw-r-- 0 cassowary  1 Jan 12:34 -N music.m4a .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- music.mp3 +drwxrwxr-x - cassowary  1 Jan 12:34 -N nested /testcases/git2/target: .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- another ignored file diff --git a/xtests/git_2_ignoreds b/xtests/git_2_ignoreds index 341a7ea..0feaf0b 100644 --- a/xtests/git_2_ignoreds +++ b/xtests/git_2_ignoreds @@ -1,2 +1,3 @@ .rw-rw-r-- 0 cassowary  1 Jan 12:34 -N music.m4a .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- music.mp3 +drwxrwxr-x - cassowary  1 Jan 12:34 -N nested diff --git a/xtests/git_2_recurse b/xtests/git_2_recurse index 12d2c95..3a9947c 100644 --- a/xtests/git_2_recurse +++ b/xtests/git_2_recurse @@ -19,6 +19,11 @@ /testcases/git2/ignoreds: .rw-rw-r-- 0 cassowary  1 Jan 12:34 -N music.m4a .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- music.mp3 +drwxrwxr-x - cassowary  1 Jan 12:34 -N nested + +/testcases/git2/ignoreds/nested: +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -- 70s grove.mp3 +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -N funky chicken.m4a /testcases/git2/target: .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- another ignored file diff --git a/xtests/git_2_tree b/xtests/git_2_tree index fd864cd..a6c8ffa 100644 --- a/xtests/git_2_tree +++ b/xtests/git_2_tree @@ -8,6 +8,9 @@ .rw-rw-r-- 0 cassowary  1 Jan 12:34 -- │ └── subfile drwxrwxr-x - cassowary  1 Jan 12:34 -N ├── ignoreds .rw-rw-r-- 0 cassowary  1 Jan 12:34 -N │ ├── music.m4a -.rw-rw-r-- 0 cassowary  1 Jan 12:34 -- │ └── music.mp3 +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -- │ ├── music.mp3 +drwxrwxr-x - cassowary  1 Jan 12:34 -N │ └── nested +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -- │ ├── 70s grove.mp3 +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -N │ └── funky chicken.m4a drwxrwxr-x - cassowary  1 Jan 12:34 -- └── target .rw-rw-r-- 0 cassowary  1 Jan 12:34 --  └── another ignored file