From 8d5281115e1bf362aa2977e70c63bb1d5c83fc40 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 14 Mar 2022 15:13:06 +0100 Subject: [PATCH] DEV: Use the --no-rebase option of `git pull` (#16180) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …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. ``` --- lib/tasks/plugin.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake index 71a573ebe59..8c31bbe0f80 100644 --- a/lib/tasks/plugin.rake +++ b/lib/tasks/plugin.rake @@ -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