lib/gitx/cli/cleanup_command.rb in gitx-2.23.1 vs lib/gitx/cli/cleanup_command.rb in gitx-2.23.2.ci.182.1

@@ -27,12 +27,19 @@
       end
 
       # @return list of branches that have been merged
       # filter out reserved and aggregate branches
       def filtered_merged_branches(source)
-        merged_branches(source).reject do |branch|
-          config.reserved_branches.include?(branch) || config.aggregate_branch?(branch)
+        merged_branches(source).select do |branch|
+          deletable_branch?(branch)
         end
+      end
+
+      def deletable_branch?(branch)
+        return false if config.reserved_branches.include?(branch)
+        return false if config.aggregate_branch?(branch)
+        return false if config.base_branch == branch
+        true
       end
 
       # @return list of branches that have been merged
       # see http://stackoverflow.com/questions/26804024/git-branch-merged-sha-via-rugged-libgit2-bindings
       def merged_branches(source)