From cfc05eef009b4bcdd1cb139513e5e6adcb819d64 Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Mon, 28 Aug 2017 18:24:20 +0100 Subject: [PATCH] Add test for nested Git repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t know how this should work, but let’s at least record the current behaviour in case it changes --- Vagrantfile | 5 +++++ xtests/git_1212 | 1 + xtests/git_2_recurse | 4 ++++ xtests/git_2_repository | 1 + xtests/git_2_tree | 8 +++++--- xtests/run.sh | 15 ++++++++------- 6 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 xtests/git_2_repository diff --git a/Vagrantfile b/Vagrantfile index c08c3943..f6107da4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -544,6 +544,11 @@ Vagrant.configure(2) do |config| mkdir "target" touch "target/another ignored file" + mkdir "deeply/nested/repository" + cd "deeply/nested/repository" + git init + touch subfile + find "#{test_dir}/git2" -exec touch {} -t #{some_date} \\; sudo chown #{user}:#{user} -R "#{test_dir}/git2" EOF diff --git a/xtests/git_1212 b/xtests/git_1212 index a283aff5..6e4408a8 100644 --- a/xtests/git_1212 +++ b/xtests/git_1212 @@ -13,3 +13,4 @@ /testcases/git2/deeply/nested: drwxrwxr-x - cassowary  1 Jan 12:34 -N directory +drwxrwxr-x - cassowary  1 Jan 12:34 -N repository diff --git a/xtests/git_2_recurse b/xtests/git_2_recurse index 16d37389..163dd6bc 100644 --- a/xtests/git_2_recurse +++ b/xtests/git_2_recurse @@ -7,11 +7,15 @@ /testcases/git2/deeply/nested: drwxrwxr-x - cassowary  1 Jan 12:34 directory +drwxrwxr-x - cassowary  1 Jan 12:34 repository /testcases/git2/deeply/nested/directory: .rw-rw-r-- 0 cassowary  1 Jan 12:34 l8st .rw-rw-r-- 18 cassowary  1 Jan 12:34 upd8d +/testcases/git2/deeply/nested/repository: +.rw-rw-r-- 0 cassowary  1 Jan 12:34 subfile + /testcases/git2/ignoreds: .rw-rw-r-- 0 cassowary  1 Jan 12:34 music.m4a .rw-rw-r-- 0 cassowary  1 Jan 12:34 music.mp3 diff --git a/xtests/git_2_repository b/xtests/git_2_repository new file mode 100644 index 00000000..e76772d1 --- /dev/null +++ b/xtests/git_2_repository @@ -0,0 +1 @@ +.rw-rw-r-- 0 cassowary  1 Jan 12:34 -N subfile diff --git a/xtests/git_2_tree b/xtests/git_2_tree index b57e1bce..a3941c4f 100644 --- a/xtests/git_2_tree +++ b/xtests/git_2_tree @@ -1,9 +1,11 @@ drwxrwxr-x - cassowary  1 Jan 12:34 /testcases/git2 drwxrwxr-x - cassowary  1 Jan 12:34 ├── deeply drwxrwxr-x - cassowary  1 Jan 12:34 │ └── nested -drwxrwxr-x - cassowary  1 Jan 12:34 │ └── directory -.rw-rw-r-- 0 cassowary  1 Jan 12:34 │ ├── l8st -.rw-rw-r-- 18 cassowary  1 Jan 12:34 │ └── upd8d +drwxrwxr-x - cassowary  1 Jan 12:34 │ ├── directory +.rw-rw-r-- 0 cassowary  1 Jan 12:34 │ │ ├── l8st +.rw-rw-r-- 18 cassowary  1 Jan 12:34 │ │ └── upd8d +drwxrwxr-x - cassowary  1 Jan 12:34 │ └── repository +.rw-rw-r-- 0 cassowary  1 Jan 12:34 │ └── subfile drwxrwxr-x - cassowary  1 Jan 12:34 ├── ignoreds .rw-rw-r-- 0 cassowary  1 Jan 12:34 │ ├── music.m4a .rw-rw-r-- 0 cassowary  1 Jan 12:34 │ └── music.mp3 diff --git a/xtests/run.sh b/xtests/run.sh index ad17c672..11da8d98 100755 --- a/xtests/run.sh +++ b/xtests/run.sh @@ -196,13 +196,14 @@ $exa $testcases/git/additions -l --git 2>&1 | diff -q - $results/git_1_a $exa $testcases/git/edits -l --git 2>&1 | diff -q - $results/git_1_edits || exit 1 $exa $testcases/git/{additions,edits} -l --git 2>&1 | diff -q - $results/git_1_both || exit 1 -$exa $testcases/git2 -l --git 2>&1 | diff -q - $results/git_2_long || exit 1 -$exa $testcases/git2 -l 2>&1 | diff -q - $results/git_2_nogit || exit 1 -$exa $testcases/git2 --tree -l --git 2>&1 | diff -q - $results/git_2_tree || exit 1 -$exa $testcases/git2 --recurse -l --git 2>&1 | diff -q - $results/git_2_recurse || exit 1 -$exa $testcases/git2/ignoreds -l --git 2>&1 | diff -q - $results/git_2_ignoreds || exit 1 -$exa $testcases/git2/target -l --git 2>&1 | diff -q - $results/git_2_target || exit 1 -$exa $testcases/git2/{deeply,ignoreds,target} -l --git 2>&1 | diff -q - $results/git_2_all || exit 1 +$exa $testcases/git2 -l --git 2>&1 | diff -q - $results/git_2_long || exit 1 +$exa $testcases/git2 -l 2>&1 | diff -q - $results/git_2_nogit || exit 1 +$exa $testcases/git2 --tree -l --git 2>&1 | diff -q - $results/git_2_tree || exit 1 +$exa $testcases/git2 --recurse -l --git 2>&1 | diff -q - $results/git_2_recurse || exit 1 +$exa $testcases/git2/ignoreds -l --git 2>&1 | diff -q - $results/git_2_ignoreds || exit 1 +$exa $testcases/git2/target -l --git 2>&1 | diff -q - $results/git_2_target || exit 1 +$exa $testcases/git2/deeply/nested/repository -l --git 2>&1 | diff -q - $results/git_2_repository || exit 1 +$exa $testcases/git2/{deeply,ignoreds,target} -l --git 2>&1 | diff -q - $results/git_2_all || exit 1 $exa $testcases/git $testcases/git2 --git --long | diff -q - $results/git_12 || exit 1