diff options
| author |  Lars Schneider <larsxschneider@gmail.com> | 2016-04-28 08:26:33 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-28 10:03:13 -0700 |
| commit | 82f2567e3d01a6eeb4c6a0b9139232034de6e60f (patch) | |
| tree | 1ca0f66b032017edf28f3b0e0035d4fe795e4e5f /git-merge-resolve.sh | |
| parent | travis-ci: express Linux/OS X dependency versions more clearly (diff) | |
| download | tgif-82f2567e3d01a6eeb4c6a0b9139232034de6e60f.tar.xz | |
git-p4: fix Git LFS pointer parsing
Git LFS 1.2.0 removed a preamble from the output of the 'git lfs pointer'
command [1] which broke the parsing of this output. Adjust the parser
to support the old and the new format.
Please note that this patch slightly changes the second return parameter
from a list of LF terminated strings to a single string that contains
a number of LF characters.
[1] https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Helped-by: Sebastian Schuberth <sschuberth@gmail.com>
Helped-by: Ben Woosley <ben.woosley@gmail.com>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions