From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 May 2016 21:40:08 +0000 (-0700)
Subject: Merge branch 'ls/p4-lfs' into HEAD
X-Git-Tag: v2.8.3~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/803fd70ceee3b86861d8b09b27861c4f85828b82?ds=inline;hp=-c

Merge branch 'ls/p4-lfs' into HEAD

Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
git-p4: fix Git LFS pointer parsing
travis-ci: express Linux/OS X dependency versions more clearly
travis-ci: update Git-LFS and P4 to the latest version
---

803fd70ceee3b86861d8b09b27861c4f85828b82
diff --combined t/t9824-git-p4-git-lfs.sh
index 3fc6790b07,ca93ac8813..110a7e7924
--- a/t/t9824-git-p4-git-lfs.sh
+++ b/t/t9824-git-p4-git-lfs.sh
@@@ -13,6 -13,10 +13,10 @@@ test_file_in_lfs () 
  	FILE="$1" &&
  	SIZE="$2" &&
  	EXPECTED_CONTENT="$3" &&
+ 	sed -n '1,1 p' "$FILE" | grep "^version " &&
+ 	sed -n '2,2 p' "$FILE" | grep "^oid " &&
+ 	sed -n '3,3 p' "$FILE" | grep "^size " &&
+ 	test_line_count = 3 "$FILE" &&
  	cat "$FILE" | grep "size $SIZE" &&
  	HASH=$(cat "$FILE" | grep "oid sha256:" | sed -e "s/oid sha256://g") &&
  	LFS_FILE=".git/lfs/objects/$(echo "$HASH" | cut -c1-2)/$(echo "$HASH" | cut -c3-4)/$HASH" &&
@@@ -265,7 -269,7 +269,7 @@@ test_expect_success 'Add big files to r
  		# We only import HEAD here ("@all" is missing!)
  		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 &&
  
  		cat >expect <<-\EOF &&