File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-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
@@ -575,6 +575,12 @@ subrepo:pull() {
575
575
576
576
o " Commit the new '$subrepo_commit_ref ' content."
577
577
CALL subrepo:commit
578
+
579
+ o " git lfs pull $subrepo_remote "
580
+ RUN git lfs pull " $subrepo_remote "
581
+
582
+ o " git commit -a --amend --no-edit"
583
+ RUN git commit -a --amend --no-edit
578
584
}
579
585
580
586
# Push a properly merged subrepo branch upstream:
@@ -664,7 +670,7 @@ subrepo:push() {
664
670
" $force_wanted " && force=' --force'
665
671
666
672
o " Push$force branch '$branch_name ' to '$subrepo_remote ' ($subrepo_branch )."
667
- RUN git push$force " $subrepo_remote " " $branch_name " :" $subrepo_branch "
673
+ RUN git push$force --no-verify " $subrepo_remote " " $branch_name " :" $subrepo_branch "
668
674
669
675
o " Create ref '$refs_subrepo_push ' for branch '$branch_name '."
670
676
git:make-ref " $refs_subrepo_push " " $branch_name "
You can’t perform that action at this time.
0 commit comments