Skip to content

Commit 4e934e3

Browse files
author
Sylvain
committed
Minimalist LFS support (add relevant git lfs pull command at the end of subrepo pull and git lfs in temporary folder)
1 parent 60b484d commit 4e934e3

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=meta: 0.0.2
22

33
name: git-subrepo
4-
version: 0.4.1
4+
version: 0.4.2-lfs
55
abstract: Git Submodule Alternative
66
homepage: https://github.com/ingydotnet/git-subrepo#readme
77
license: MIT

lib/git-subrepo

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else
2828
fi
2929
bash+:import :std can
3030

31-
VERSION=0.4.1
31+
VERSION=0.4.2-LFS
3232
REQUIRED_GIT_VERSION=2.7.0
3333
GIT_TMP="$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp"
3434

@@ -572,6 +572,9 @@ subrepo:pull() {
572572

573573
o "Create ref '$refs_subrepo_branch' for branch '$branch_name'."
574574
git:make-ref "$refs_subrepo_branch" "$branch_name"
575+
576+
o "git lfs pull $subrepo_remote"
577+
RUN git lfs pull "$subrepo_remote"
575578

576579
o "Commit the new '$subrepo_commit_ref' content."
577580
CALL subrepo:commit
@@ -664,7 +667,7 @@ subrepo:push() {
664667
"$force_wanted" && force=' --force'
665668

666669
o "Push$force branch '$branch_name' to '$subrepo_remote' ($subrepo_branch)."
667-
RUN git push$force "$subrepo_remote" "$branch_name":"$subrepo_branch"
670+
RUN git push$force --no-verify "$subrepo_remote" "$branch_name":"$subrepo_branch"
668671

669672
o "Create ref '$refs_subrepo_push' for branch '$branch_name'."
670673
git:make-ref "$refs_subrepo_push" "$branch_name"
@@ -1772,8 +1775,16 @@ git:is_merge_commit() {
17721775

17731776
git:create-worktree() {
17741777
local branch="$1"
1778+
local pwd=$(pwd)
17751779
worktree="$GIT_TMP/$branch"
1780+
o "git worktree add '$worktree' '$branch'"
17761781
RUN git worktree add "$worktree" "$branch"
1782+
1783+
cd "$worktree"
1784+
o "git lfs pull from folder '$(pwd)' then commit"
1785+
RUN git lfs pull
1786+
RUN git commit -a --amend --allow-empty --no-edit
1787+
cd "$pwd"
17771788
}
17781789

17791790
git:remove-worktree() {

0 commit comments

Comments
 (0)