Re: [PATCH v2 2/2] git-p4: fix Git LFS pointer parsing
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 20, 2016, 21:01 UTC
- Message-ID
- <xmqq60vcuh9v.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1461139809-6573-3-git-send-email-larsxschneider@gmail.com>
larsxschneider@gmail.com writes:
Show 22 quoted lines
> - pointerContents = [i+'\n' for i in pointerFile.split('\n')[2:][:-1]]
> - oid = pointerContents[1].split(' ')[1].split(':')[1][:-1]
> +
> + # Git LFS removed the preamble in the output of the 'pointer' command
> + # starting from version 1.2.0. Check for the preamble here to support
> + # earlier versions.
> + # c.f. https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
> + preamble = 'Git LFS pointer for ' + contentFile + '\n\n'
> + if pointerFile.startswith(preamble):
> + pointerFile = pointerFile[len(preamble):]
> +
> + oidEntry = [i for i in pointerFile.split('\n') if i.startswith('oid')]
> + oid = oidEntry[0].split(' ')[1].split(':')[1]
> localLargeFile = os.path.join(
> os.getcwd(),
> '.git', 'lfs', 'objects', oid[:2], oid[2:4],
> @@ -1073,7 +1082,7 @@ class GitLFS(LargeFileSystem):
> )
> # LFS Spec states that pointer files should not have the executable bit set.
> gitMode = '100644'
> - return (gitMode, pointerContents, localLargeFile)
> + return (gitMode, pointerFile, localLargeFile)It seems to me that you used to return pointerContents which is an array of lines (each of which are LF terminated); the updated one returns pointerFile which is a bare string with many lines.
Is that change intentional? Does the difference matter to the caller of this method? Even if it doesn't, is it a good idea to change it as part of this commit?
Show 17 quoted lines
> def pushFile(self, localLargeFile):
> uploadProcess = subprocess.Popen(
> diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh
> index 0b664a3..ca93ac8 100755
> --- a/t/t9824-git-p4-git-lfs.sh
> +++ b/t/t9824-git-p4-git-lfs.sh
> @@ -13,6 +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" &&