git-fixup

git-fixup

#! /usr/bin/env ruby

staged_files = Array(`git diff --name-only --cached`.split("\n"))
puts "staged files are: #{staged_files}"
staged_files.each do |file|
  sha_to_fixup = `git log -n1 --format=%h #{file}`.gsub(/\s*/, '')
  # assert sha has not been merged
  fail "no commit to fixup in this topic branch" if `git branch --contains #{sha_to_fixup}`.split("\n").any? { |branch| branch =~ /\s*master\s*/ }
  puts sha_to_fixup
  `git commit --fixup #{sha_to_fixup}`
  `git stash`
  exec("git rebase -i --autosquash #{sha_to_fixup}^")
  `git stash pop`
end