|
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,9 +572,13 @@ 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 |
| - |
| 575 | + |
576 | 576 | o "Commit the new '$subrepo_commit_ref' content."
|
577 | 577 | 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 |
578 | 582 | }
|
579 | 583 |
|
580 | 584 | # Push a properly merged subrepo branch upstream:
|
@@ -664,7 +668,7 @@ subrepo:push() {
|
664 | 668 | "$force_wanted" && force=' --force'
|
665 | 669 |
|
666 | 670 | 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" |
668 | 672 |
|
669 | 673 | o "Create ref '$refs_subrepo_push' for branch '$branch_name'."
|
670 | 674 | git:make-ref "$refs_subrepo_push" "$branch_name"
|
@@ -1772,8 +1776,16 @@ git:is_merge_commit() {
|
1772 | 1776 |
|
1773 | 1777 | git:create-worktree() {
|
1774 | 1778 | local branch="$1"
|
| 1779 | + local pwd=$(pwd) |
1775 | 1780 | worktree="$GIT_TMP/$branch"
|
| 1781 | + o "git worktree add '$worktree' '$branch'" |
1776 | 1782 | 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" |
1777 | 1789 | }
|
1778 | 1790 |
|
1779 | 1791 | git:remove-worktree() {
|
|
0 commit comments