domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/feeds: silence git warning by selecting pull style

Browse Source 
Silence the warning in git 2.27 about undefined fast-forward style
in git pull. Define "ff-only" as the style.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman
2020-11-14 11:33:00 +02:00
committed by Paul Spooren
parent e34f04f4bc
commit 2b1d92f134
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/feeds
View File

@@ -158,8 +158,8 @@ my %update_method = (
'init' => "git clone --depth 1 '%s' '%s'", 'init' => "git clone --depth 1 '%s' '%s'",
'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'", 'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff", 'update' => "git pull --ff-only",
'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)", 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)",
'post_update' => "git submodule update --init --recursive", 'post_update' => "git submodule update --init --recursive",
'controldir' => ".git", 'controldir' => ".git",
'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},