discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Use the --no-rebase option of git pull (#16180)

Browse Source 
…to avoid repeatedly printed notes:

```
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
```
This commit is contained in:
Jarek Radosz 2022-03-14 15:13:06 +01:00 committed by GitHub
parent fa7d34f593
commit 8d5281115e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/plugin.rake
View File

@ -102,7 +102,7 @@ task 'plugin:update', :plugin do |t, args|
`git -C '#{plugin_path}' branch -u origin/main main`
end
update_status = system("git -C '#{plugin_path}' pull")
update_status = system("git -C '#{plugin_path}' pull --no-rebase")
abort("Unable to pull latest version of plugin #{plugin_path}") unless update_status
end