Skip to content

Commit 7ab6da3

Browse files
committed
Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
Fix a broken test. * ls/p4-lfs-test-fix-2.7.0: t9824: fix wrong reference value t9824: fix broken &&-chain in a subshell
2 parents f735a50 + 9e220fe commit 7ab6da3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t9824-git-p4-git-lfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr
265265
# We only import HEAD here ("@all" is missing!)
266266
git p4 clone --destination="$git" //depot &&
267267
268-
test_file_in_lfs file6.bin 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ"
268+
test_file_in_lfs file6.bin 39 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" &&
269269
test_file_count_in_dir ".git/lfs/objects" 1 &&
270270
271271
cat >expect <<-\EOF &&

0 commit comments

Comments
 (0)