rebase-unfucker.rb

#!/usr/bin/env ruby
# so we need to take branch.txt and existing.txt, parse the messages into a hash

master = {}

mastertext = File.read "/Users/luke/fuckup/master.txt"

mastertext.split("\n").each do |line|
  sha, *message = line.split(" ")
  message = Array(message).join(" ")

  master[message] = sha
end


branchtext = $stdin.read

branchtext.split("\n").each do |line|
  pick, sha, *message = line.split(" ")
  message = Array(message).join(" ")

  if master[message]
    # commit is on master, we don't want that shit
    puts "# #{line} # commit is on master as #{master[message]}"
  else
    # commit is not on master, we want that shit
    puts line
  end
end