From f431e543a5f155fd64d397ae04d269c3907f42b7 Mon Sep 17 00:00:00 2001 From: Josh Hagins Date: Fri, 10 Jul 2015 09:46:35 -0400 Subject: update: explicitly no-ff merge and rebase. This overrides user configuration which may do otherwise. Closes Homebrew/homebrew#41570. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/update.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 33678db3a..1d4eb5928 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -196,7 +196,8 @@ class Updater safe_system "git", "config", "core.autocrlf", "false" args = ["pull"] - args << "--rebase" if ARGV.include? "--rebase" + args << "--ff" + args << ((ARGV.include? "--rebase") ? "--rebase" : "--no-rebase") args += quiet args << "origin" # the refspec ensures that 'origin/master' gets updated -- cgit v1.2.3