diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-14 11:33:00 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2020-11-26 19:29:18 -1000 |
| commit | 2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03 (patch) | |
| tree | bd1e7074ecb7199c06445440a004e4c57aa9216d /scripts | |
| parent | e34f04f4bcaae2abead8e85b42dbcbba3ab2a065 (diff) | |
| download | upstream-2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03.tar.gz upstream-2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03.tar.bz2 upstream-2b1d92f134e9b6c5744a3cc2d0e22273a7a5fe03.zip | |
scripts/feeds: silence git warning by selecting pull style
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index 69ab60278a..22d4f8e8f4 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -158,8 +158,8 @@ my %update_method = ( 'init' => "git clone --depth 1 '%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 -", - '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'"}, |