diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-01-14 14:00:59 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-01-14 14:06:59 +0900 |
| commit | 47d6e6db01fdda96309d13d99f51076604887195 (patch) | |
| tree | c9f1e715066753126a5a7333a3fc37140c5ea3e2 /debian/_buildscripts/local/update_repositories.sh | |
| parent | dc43bbf3d421475c2128d7777c57aa78e0406583 (diff) | |
| download | tde-packaging-47d6e6db01fdda96309d13d99f51076604887195.tar.gz tde-packaging-47d6e6db01fdda96309d13d99f51076604887195.zip | |
DEB buildscripts:
1. update supported distros
2. fixed update of local submodules with worktrees
3. update list of modules to be built
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'debian/_buildscripts/local/update_repositories.sh')
| -rwxr-xr-x | debian/_buildscripts/local/update_repositories.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh index 4286393ef..57305c59d 100755 --- a/debian/_buildscripts/local/update_repositories.sh +++ b/debian/_buildscripts/local/update_repositories.sh @@ -283,6 +283,12 @@ function _do_worktree_update() git branch -u "origin/${CURR_BR}" &>/dev/null #$ git reset --hard "origin/${CURR_BR}" &>/dev/null fi + # If this is a clone of a local repository, make sure to do a fetch + # operation first, otherwise this clone won't see the latest changes + if [ "`git config --get remote.origin.url`" = "${MOD_REPO_PATH}" ]; then + eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG + eval git worktree prune $OPT_VERBOSE_LOG + fi # Update eval git reset --hard HEAD $OPT_VERBOSE_LOG eval git clean -dxff $OPT_VERBOSE_LOG |