Contents

module BardGit
  private
    def current_branch
      ref = `git symbolic-ref HEAD 2>&1`.chomp
      return false if ref =~ /^fatal:/
      ref.sub(/refs\/heads\//, '') # refs/heads/master ... we want "master"
    end

    def fast_forward_merge?(root = "origin/integration", branch = "HEAD")
      run_crucial "git fetch origin"
      root_head = run_crucial "git rev-parse #{root}"
      branch_head = run_crucial "git rev-parse #{branch}"
      @common_ancestor = find_common_ancestor root_head, branch_head 
      @common_ancestor == root_head
    end

    def find_common_ancestor(head1, head2)
      run_crucial "git merge-base #{head1} #{head2}"
    end

    def changed_files(old_rev, new_rev)
      run_crucial("git diff #{old_rev} #{new_rev} --diff-filter=ACMRD --name-only").split("\n") 
    end

    def submodule_dirty?
      @repo ||= Grit::Repo.new "."
      submodules = Grit::Submodule.config(@repo, @repo.head.name)
      submodules.any? do |name, submodule|
        Dir.chdir submodule["path"] do
          not `git status`.include? "working directory clean"
        end
      end
    end

    def submodule_unpushed?
      @repo ||= Grit::Repo.new "."
      submodules = Grit::Submodule.config(@repo, @repo.head.name)
      submodules.any? do |name, submodule|
        Dir.chdir submodule["path"] do
          `git fetch origin`
          submodule["id"] != `git rev-parse origin/#{current_branch}`.chomp
        end
      end
    end
end

Version data entries

78 entries across 78 versions & 1 rubygems

Version	Path
bard-0.11.3	lib/bard/git.rb
bard-0.11.2	lib/bard/git.rb
bard-0.11.1	lib/bard/git.rb
bard-0.11.0	lib/bard/git.rb
bard-0.10.0	lib/bard/git.rb
bard-0.9.14	lib/bard/git.rb
bard-0.9.13	lib/bard/git.rb
bard-0.9.12	lib/bard/git.rb
bard-0.9.11	lib/bard/git.rb
bard-0.9.10	lib/bard/git.rb
bard-0.9.9	lib/bard/git.rb
bard-0.9.8	lib/bard/git.rb
bard-0.9.7	lib/bard/git.rb
bard-0.9.6	lib/bard/git.rb
bard-0.9.5	lib/bard/git.rb
bard-0.9.4	lib/bard/git.rb
bard-0.9.3	lib/bard/git.rb
bard-0.9.2	lib/bard/git.rb
bard-0.9.1	lib/bard/git.rb
bard-0.9.0	lib/bard/git.rb