Browse Source

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
maint
Junio C Hamano 9 years ago
parent
commit
7ab6da3c40
  1. 2
      t/t9824-git-p4-git-lfs.sh

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

@ -265,7 +265,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr
# We only import HEAD here ("@all" is missing!) # We only import HEAD here ("@all" is missing!)
git p4 clone --destination="$git" //depot && git p4 clone --destination="$git" //depot &&


test_file_in_lfs file6.bin 13 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" test_file_in_lfs file6.bin 39 "content 6 bin 39 bytes XXXXXYYYYYZZZZZ" &&
test_file_count_in_dir ".git/lfs/objects" 1 && test_file_count_in_dir ".git/lfs/objects" 1 &&


cat >expect <<-\EOF && cat >expect <<-\EOF &&

Loading…
Cancel
Save