diff options
| author | Erich Eckner <git@eckner.net> | 2019-07-12 11:02:35 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-07-12 11:02:35 +0200 |
| commit | 1c7a63ff2b8d7d7dfe51d26b97cf16d06c93a08e (patch) | |
| tree | 29a537348d0d3f71bc7d69101bbc90511cb2518a /bin/get-package-updates | |
| parent | c6214285b150470c6b497ddfee0701b6b06ff589 (diff) | |
| download | builder-1c7a63ff2b8d7d7dfe51d26b97cf16d06c93a08e.tar.xz | |
bin/get-package-updates: use `git pull --ff-only` instead of `git update remotes` on non-bare source repo
Diffstat (limited to 'bin/get-package-updates')
| -rwxr-xr-x | bin/get-package-updates | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get-package-updates b/bin/get-package-updates index 8763629..d159ace 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -217,7 +217,7 @@ for repo in ${repo_names}; do eval repo_path='"${repo_paths__'"${repo}"'}"' # Update git repositories (official packages, community packages and the repository of package customizations). if [ -d "${repo_path}/.git" ]; then - git -C "${repo_path}" remote update + git -C "${repo_path}" pull --ff-only else git -C "${repo_path}" fetch origin master:master fi || \ |