diff --git a/filepathfilter/filepathfilter.go b/filepathfilter/filepathfilter.go index 691dc160..a34c545c 100644 --- a/filepathfilter/filepathfilter.go +++ b/filepathfilter/filepathfilter.go @@ -61,8 +61,8 @@ func (f *Filter) Allows(filename string) bool { } } - tracerx.Printf("filepathfilter: rejecting %q via %v", filename, f.include) if !included && len(f.include) > 0 { + tracerx.Printf("filepathfilter: rejecting %q via %v", filename, f.include) return false } diff --git a/t/t-checkout.sh b/t/t-checkout.sh index 4cce1345..ae2dd917 100755 --- a/t/t-checkout.sh +++ b/t/t-checkout.sh @@ -41,13 +41,15 @@ begin_test "checkout" rm -rf file1.dat file2.dat file3.dat folder1/nested.dat folder2/nested.dat echo "checkout should replace all" - git lfs checkout 2>&1 | tee checkout.log + GIT_TRACE=1 git lfs checkout 2>&1 | tee checkout.log [ "$contents" = "$(cat file1.dat)" ] [ "$contents" = "$(cat file2.dat)" ] [ "$contents" = "$(cat file3.dat)" ] [ "$contents" = "$(cat folder1/nested.dat)" ] [ "$contents" = "$(cat folder2/nested.dat)" ] grep "Checking out LFS objects: 100% (5/5), 95 B" checkout.log + grep 'accepting "file1.dat"' checkout.log + ! grep 'rejecting "file1.dat"' checkout.log # Remove the working directory rm -rf file1.dat file2.dat file3.dat folder1/nested.dat folder2/nested.dat