diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-12-30 20:30:49 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-12-30 20:30:49 +0000 |
| commit | f3098f566ca89f6d7ebc8e91e2a78e751a7ef924 (patch) | |
| tree | e8f31b38d39648e85b31c85561db043d48c34f65 /include/git.sh | |
| parent | 5fb6e36f035c78b297a035574444d17c19578b35 (diff) | |
git.sh multi-tree: grab submodules *after* patches
right now, if we want to patch a project such that certain
submodules are no tdownloaded, or diffreent submodules are
downloaded, or current ones are downloaded from other
locations, we cannot do this, because we apply submodule
updates *before* applying patches.
therefore, we should change it so that they are applied
*after* installing patches.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/git.sh')
| -rwxr-xr-x | include/git.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git.sh b/include/git.sh index b0ebc937..27c2a3df 100755 --- a/include/git.sh +++ b/include/git.sh @@ -63,11 +63,11 @@ prepare_new_tree() cp -R "src/${project}/${project}" "${tmp_git_dir}" || \ err "prepare_new_tree ${project}/${tree}: can't make tmpclone" git_reset_rev "${tmp_git_dir}" "${rev}" + git_am_patches "${tmp_git_dir}" "$PWD/$cfgsdir/$tree/patches" || \ + err "prepare_new_tree ${project}/${tree}: patch fail" [ ! -f "${tmp_git_dir}/.gitmodules" ] || \ git -C "${tmp_git_dir}" submodule update --init --checkout \ || err "prepare_new_tree ${project}/${tree}: !submodules" - git_am_patches "${tmp_git_dir}" "$PWD/$cfgsdir/$tree/patches" || \ - err "prepare_new_tree ${project}/${tree}: patch fail" [ "${patchfail}" = "y" ] && err "PATCH FAIL" mv "${tmp_git_dir}" "src/${project}/${tree}" || \ |