Skip to content

Commit 0717510

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 0717510

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Meta

+1-1
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

+15-3
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,9 +572,13 @@ subrepo:pull() {
572572

573573
o "Create ref '$refs_subrepo_branch' for branch '$branch_name'."
574574
git:make-ref "$refs_subrepo_branch" "$branch_name"
575-
575+
576576
o "Commit the new '$subrepo_commit_ref' content."
577577
CALL subrepo:commit
578+
579+
o "git lfs pull $subrepo_remote then commit"
580+
RUN git lfs pull "$subrepo_remote"
581+
RUN git commit -a --amend --allow-empty --no-edit
578582
}
579583

580584
# Push a properly merged subrepo branch upstream:
@@ -664,7 +668,7 @@ subrepo:push() {
664668
"$force_wanted" && force=' --force'
665669

666670
o "Push$force branch '$branch_name' to '$subrepo_remote' ($subrepo_branch)."
667-
RUN git push$force "$subrepo_remote" "$branch_name":"$subrepo_branch"
671+
RUN git push$force --no-verify "$subrepo_remote" "$branch_name":"$subrepo_branch"
668672

669673
o "Create ref '$refs_subrepo_push' for branch '$branch_name'."
670674
git:make-ref "$refs_subrepo_push" "$branch_name"
@@ -1772,8 +1776,16 @@ git:is_merge_commit() {
17721776

17731777
git:create-worktree() {
17741778
local branch="$1"
1779+
local pwd=$(pwd)
17751780
worktree="$GIT_TMP/$branch"
1781+
o "git worktree add '$worktree' '$branch'"
17761782
RUN git worktree add "$worktree" "$branch"
1783+
1784+
cd "$worktree"
1785+
o "git lfs pull from folder '$(pwd)' then commit"
1786+
RUN git lfs pull
1787+
RUN git commit -a --amend --allow-empty --no-edit
1788+
cd "$pwd"
17771789
}
17781790

17791791
git:remove-worktree() {

0 commit comments

Comments
 (0)