diff options
author | Paul Spooren <mail@aparcar.org> | 2021-10-11 10:47:00 -1000 |
---|---|---|
committer | Paul Spooren <mail@aparcar.org> | 2022-02-15 00:24:24 +0100 |
commit | 7fae1e5677e9bb4979c8d4ac99be4de6955b13d0 (patch) | |
tree | 65fc6dd60cb6ee540aeb202197409ac8a68a004a /scripts/feeds | |
parent | 2120cad38d6f78cc1b727459eeedb6ed9a14edbe (diff) | |
download | openwrt-7fae1e5677e9bb4979c8d4ac99be4de6955b13d0.tar.gz openwrt-7fae1e5677e9bb4979c8d4ac99be4de6955b13d0.tar.bz2 openwrt-7fae1e5677e9bb4979c8d4ac99be4de6955b13d0.zip |
feeds: use git-src-full to allow Git versioning
Both $(AUTORELEASE) and $(PKG_SRC_VERSION) (from luci.git) use the Git
log to determine releases and package timestamps.
Feeds are shallow cloned by default, resulting in an incomplete Git log
and therefore different local package versions than offered upstream.
This commits sets the default feeds to use `src-git-full` to solve that.
Add fixes from "2b1d92f: scripts/feeds: silence git warning by selecting
pull style" to `src-git-full`
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-x | scripts/feeds | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index d8bbd48663..aee73e793f 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -167,8 +167,8 @@ my %update_method = ( 'init' => "git clone '%s' '%s'", 'init_branch' => "git clone --branch '%s' '%s' '%s'", 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", - 'update' => "git pull --ff", - 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)", + 'update' => "git pull --ff-only", + 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)", 'post_update' => "git submodule update --init --recursive", 'controldir' => ".git", 'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, |