buildscript: fix fetch step #153

fbl · 2021-07-09T17:44:44+02:00

fbl commented

2021-07-09 17:44:44 +02:00

git pull combines two steps: fetch and merge. When checking out
another revision into an existing build directory, git pull tries to merge
the changes from the new revision into the current HEAD, before checking
out the new revision with git checkout. Because we apply various patches
to OpenWrt, the merge step almost certainly fails, so the new revision
is not checked out.

As the merge isn't needed anyway, use git fetch instead, which only
fetches updates from the remote without actually applying them.

Signed-off-by: Fabian Bläse fabian@blaese.de

git pull combines two steps: fetch and merge. When checking out another revision into an existing build directory, git pull tries to merge the changes from the new revision into the current HEAD, before checking out the new revision with git checkout. Because we apply various patches to OpenWrt, the merge step almost certainly fails, so the new revision is not checked out. As the merge isn't needed anyway, use git fetch instead, which only fetches updates from the remote without actually applying them. Signed-off-by: Fabian Bläse <fabian@blaese.de>

fbl added the

build/scripts/tools

label 2021-07-09 17:44:44 +02:00

fbl added 1 commit 2021-07-09 17:44:44 +02:00

b212c08272 buildscript: fix fetch step

git pull combines two steps: fetch and merge. When checking out
another revision into an existing build directory, git pull tries to merge
the changes from the new revision into the current HEAD, before checking
out the new revision with git checkout. Because we apply various patches
to OpenWrt, the merge step almost certainly fails, so the new revision
is not checked out.

As the merge isn't needed anyway, use git fetch instead, which only
fetches updates from the remote without actually applying them.

Signed-off-by: Fabian Bläse <fabian@blaese.de>

fbl commented

2021-07-17 14:41:16 +02:00

Dieser Pull Request sucht noch Reviewer.