Support git-lfs (large file storage) (#64)

* Support git-lfs (large file storage)

* Update readme to state git LFS support

* Silence lfs git tests

* Check for CI private key in test

* fix check on CI private key

* update env var check

* Read path from `git_cmd`, not global

The path can be modified by preceding code, so we need to read it from `git_cmd`, append the `git-lfs` directory, then write back to `git_cmd`.

* Try using `windows_verbatim` if git-lfs loaded

CI issue could be related to single quotes in `cmd.exec` entries?

* try removing single quotes from cmd.exec

* revert quote filtering scheme

* bump Julia compat to 1.8

Need bugfix to multiple calls to `addenv` on Windows

* julia compat revision

* Add CI job for Windows with Julia = 1.7.3

the `version: 'min'` jobs hit Julia 1.6.6 but we should also test against 1.7.3 on Windows to ensure the `addenv` calls are working

* Implement Mose's suggestions

Co-authored-by: Mosè Giordano <[email protected]>

Author: cgarling

.github/workflows/ci.yml

@@ -51,6 +51,9 @@ jobs:
           - os: ubuntu-22.04-arm
             arch: 'default'
             version: 'nightly'
+          - os: windows-latest
+            arch: 'default'
+            version: '1.7.3'
     steps:
       - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v2

Project.toml

@@ -1,14 +1,16 @@
 name = "Git"
 uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
-version = "1.4.0"
 authors = ["Dilum Aluthge", "contributors"]
+version = "1.5.0"
 
 [deps]
+Git_LFS_jll = "020c3dae-16b3-5ae5-87b3-4cb189e250b2"
 Git_jll = "f8c6e375-362e-5223-8a59-34ff63f689eb"
 JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 OpenSSH_jll = "9bd350c2-7e96-507f-8002-3f2e150b4e1b"
 
 [compat]
+Git_LFS_jll = "3.7"
 Git_jll = "2.44"
 JLLWrappers = "1.1"
 OpenSSH_jll = "9, 10"

README.md

@@ -8,7 +8,9 @@ not need to have Git installed on your computer, and neither do the users of
 your packages!
 
 Git.jl provides a Git binary via
-[Git_jll.jl](https://github.com/JuliaBinaryWrappers/Git_jll.jl).
+[Git_jll.jl](https://github.com/JuliaBinaryWrappers/Git_jll.jl)
+and a Git LFS binary for large file support via
+[Git_LFS_jll.jl](https://github.com/JuliaBinaryWrappers/Git_LFS_jll.jl).
 The latest version of Git.jl requires at least Julia 1.6.
 
 Git.jl is intended to work on any platform that supports Julia,

src/git_function.jl

@@ -1,4 +1,5 @@
 using OpenSSH_jll: OpenSSH_jll
+using Git_LFS_jll: Git_LFS_jll
 using JLLWrappers: pathsep, LIBPATH_env
 
 """
@@ -21,6 +22,9 @@ julia> run(git(["clone", "https://github.com/JuliaRegistries/General"]))
 to bypass the parsing of the command string.
 """
 function git(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
+    path = split(get(ENV, "PATH", ""), pathsep)
+    libpath = split(get(ENV, LIBPATH_env, ""), pathsep)
+    
     git_cmd = @static if Sys.iswindows()
         Git_jll.git(; adjust_PATH, adjust_LIBPATH)::Cmd
     else
@@ -53,20 +57,23 @@ function git(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
 
     # Use OpenSSH from the JLL: <https://github.com/JuliaVersionControl/Git.jl/issues/51>.
     if !Sys.iswindows() && OpenSSH_jll.is_available()
-        path = split(get(ENV, "PATH", ""), pathsep)
-        libpath = split(get(ENV, LIBPATH_env, ""), pathsep)
-
         path = vcat(dirname(OpenSSH_jll.ssh_path), path)
         libpath = vcat(OpenSSH_jll.LIBPATH_list, libpath)
         path = vcat(dirname(Git_jll.git_path), path)
         libpath = vcat(Git_jll.LIBPATH_list, libpath)
 
         unique!(filter!(!isempty, path))
         unique!(filter!(!isempty, libpath))
+    end
 
-        git_cmd = addenv(git_cmd, "PATH" => join(path, pathsep), LIBPATH_env => join(libpath, pathsep))
+    # Add git-lfs
+    if Git_LFS_jll.is_available()
+        path = vcat(dirname(Git_LFS_jll.git_lfs_path), path)
+        unique!(filter!(!isempty, path))
     end
 
+    git_cmd = addenv(git_cmd, "PATH" => join(path, pathsep), LIBPATH_env => join(libpath, pathsep))
+    
     return git_cmd
 end
 

test/runtests.jl

@@ -34,6 +34,20 @@ end
         @test isdir("Git.jl")
         @test isfile(joinpath("Git.jl", "Project.toml"))
     end
+
+    # git-lfs tests
+    withtempdir() do tmp_dir
+        rname = "repo-with-large-file-storage"
+        @test !isdir(rname)
+        @test !isfile(joinpath(rname, "LargeFile.zip"))
+        run(`$(git()) clone --quiet https://github.com/Apress/repo-with-large-file-storage`)
+        run(pipeline(`$(git()) -C $rname lfs install --local`; stdout=devnull))
+        run(pipeline(`$(git()) -C $rname lfs pull`; stdout=devnull))
+        @test isdir(rname)
+        @test isfile(joinpath(rname, "LargeFile.zip"))
+        # Test filesize to make sure we got real file and not small LFS pointer file
+        @test filesize(joinpath(rname, "LargeFile.zip")) > 10^6
+    end
 end
 
 @testset "Safety" begin