File tree 2 files changed +14
-3
lines changed 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change 1
1
=meta: 0.0.2
2
2
3
3
name: git-subrepo
4
- version: 0.4.1
4
+ version: 0.4.2-lfs
5
5
abstract: Git Submodule Alternative
6
6
homepage: https://github.com/ingydotnet/git-subrepo#readme
7
7
license: MIT
Original file line number Diff line number Diff line change 28
28
fi
29
29
bash+:import :std can
30
30
31
- VERSION=0.4.1
31
+ VERSION=0.4.2-LFS
32
32
REQUIRED_GIT_VERSION=2.7.0
33
33
GIT_TMP=" $( git rev-parse --git-common-dir 2> /dev/null || echo .git) /tmp"
34
34
@@ -572,6 +572,9 @@ subrepo:pull() {
572
572
573
573
o " Create ref '$refs_subrepo_branch ' for branch '$branch_name '."
574
574
git:make-ref " $refs_subrepo_branch " " $branch_name "
575
+
576
+ o " git lfs pull $subrepo_remote "
577
+ RUN git lfs pull " $subrepo_remote "
575
578
576
579
o " Commit the new '$subrepo_commit_ref ' content."
577
580
CALL subrepo:commit
@@ -664,7 +667,7 @@ subrepo:push() {
664
667
" $force_wanted " && force=' --force'
665
668
666
669
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 "
668
671
669
672
o " Create ref '$refs_subrepo_push ' for branch '$branch_name '."
670
673
git:make-ref " $refs_subrepo_push " " $branch_name "
@@ -1772,8 +1775,16 @@ git:is_merge_commit() {
1772
1775
1773
1776
git:create-worktree () {
1774
1777
local branch=" $1 "
1778
+ local pwd=$( pwd)
1775
1779
worktree=" $GIT_TMP /$branch "
1780
+ o " git worktree add '$worktree ' '$branch '"
1776
1781
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 "
1777
1788
}
1778
1789
1779
1790
git:remove-worktree () {
You can’t perform that action at this time.
0 commit comments