From aabf69cb38b73021a3241bcee4dba9bdf09f23b3 Mon Sep 17 00:00:00 2001 From: Matthew Hutchinson Date: Sat, 26 Dec 2015 23:10:05 +0000 Subject: [PATCH] [cleanup] remove die_if_rebasing method --- lib/lolcommits/runner.rb | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/lolcommits/runner.rb b/lib/lolcommits/runner.rb index f59cbdd4..7875dfb7 100644 --- a/lib/lolcommits/runner.rb +++ b/lib/lolcommits/runner.rb @@ -24,9 +24,6 @@ def initialize(attributes = {}) # this used to be handled with ActiveSupport::Callbacks, but # now we're just using a simple procedural list def run - # abort if we are in a rebase - die_if_rebasing! - # do things that need to happen before capture and plugins # do native plugins that need to happen before capture @@ -110,15 +107,6 @@ def image_file_type protected - def die_if_rebasing! - debug "Runner: Making sure user isn't rebasing" - return unless git_info && !git_info.repo_internal_path.nil? - mergeclue = File.join git_info.repo_internal_path, 'rebase-merge' - return unless File.directory? mergeclue - debug 'Runner: Rebase detected, silently exiting!' - exit 0 - end - def resize_snapshot! debug 'Runner: resizing snapshot' image = MiniMagick::Image.open(snapshot_loc)