git-fast-forward 0.0.0

data/README.markdown

@@ -0,0 +1,42 @@
+git fast-forward
+================
+
+`git fast-forward` is a git command which fast-forwards a branch to another commit.  It works just like merge, except that it never produces a merge commit.  Thus, it only works when you're fast-forwarding to a commit that's a descendent of the current branch.
+
+Workflow
+--------
+
+Here's how my team usually works:
+
+    master$ git pull --rebase
+    master$ git checkout -b new-feature
+    new-feature$ touch lib/new_code.rb
+    new-feature$ git add lib/new_code.rb
+    new-feature$ git commit -m "Implement awesome new feature."
+    
+      [meanwhile, other people have pushed new code to master...]
+    
+    new-feature$ git fetch
+    new-feature$ git rebase origin/master
+    new-feature$ git checkout master
+    master$ git merge new-feature              ### <--- The problem.
+    master$ git push
+    
+This usually works fine, but the last part always bugs me.  We rebase to keep a linear history---that's how we like it, as much as possible.  But we use the merge command, which, if things aren't rebased quite right, will make a merge commit, which is exactly what we don't want.  Usually, we won't notice it until it's pushed.  Doesn't happen a lot, but enough to write a better tool.
+
+
+Usage
+-----
+
+It's pretty straightforward:
+
+    $ gem install git-fast-forward  # or whatever
+    $ git fast-forward <commit>
+
+where `<commit>` is probably a topic branch you've just rebased.  If the commit isn't a descendent of your current commit (and therefore not eligible for fast-forwarding), you'll get a nice error message and that's that.  Otherwise, it'll fast forward just like `merge`.  In fact, it even *calls* `merge`.  So you'll get all that nice output.
+
+
+Bugs, Requests, and Contributions
+---------------------------------
+
+This thing's pretty darn simple.  If you'd like it to do something it doesn't, feel free to [add an issue](http://github.com/Peeja/git-fast-forward/issues).  Same goes for bugs.  Patches and pull requests are certainly welcome.

data/bin/git-fast-forward

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+destination = ARGV[0]
+
+destination_is_a_descendent_of_head = (`git merge-base HEAD #{destination}` == `git rev-parse HEAD`)
+
+if destination_is_a_descendent_of_head
+  system("git merge #{destination}")
+else
+  $stderr.puts("#{destination} is not a descendent of the current branch.  Refusing to fast-forward.")
+  exit 1
+end

data/lib/git-fast-forward.rb

@@ -0,0 +1 @@
+# Nothing to see here.  Just keeps rubygems happy.

data/spec/git-fast-forward_spec.rb

@@ -0,0 +1,93 @@
+require 'spec'
+
+ENV['PATH'] = "#{File.dirname(__FILE__) + '/../bin'}:#{ENV['PATH']}"
+
+describe "git fast-forward" do
+  before do
+    system <<-SH
+      rm -rf test-repo
+      mkdir test-repo
+      cd test-repo
+      git init
+    SH
+  end
+  
+  after do
+    system <<-SH
+      rm -rf test-repo
+    SH
+  end
+  
+  def run(commands)
+    commands.split("\n").each do |command|
+      command = command.strip
+      next if command.empty?
+      puts
+      puts ">> #{command}"
+      system "cd test-repo && #{command}"
+    end
+  end
+
+  def commit_named(commit_name)
+    `cd test-repo && git rev-parse --revs-only #{commit_name}`
+  end
+  
+  context "the given commit is a descendent of the current branch" do
+    before do
+      run <<-SH
+        touch initial-file
+        git add initial-file
+        git commit -m "Initial commit."
+        git branch parent-branch
+        git checkout -b descendent-branch
+        touch new-file
+        git add new-file
+        git commit -m "Adding new-file."
+      SH
+    end
+
+    it "sets the current branch to the descendent commit" do
+      descendent_commit = commit_named("descendent-branch")
+
+      run <<-SH
+        git checkout parent-branch
+        git fast-forward descendent-branch
+      SH
+
+      commit_named("parent-branch").should == descendent_commit
+    end
+  end
+
+  context "the given commit is not a descendent of the current branch" do
+    before do
+      run <<-SH
+        touch initial-file
+        git add initial-file
+        git commit -m "Initial commit."
+        git checkout -b first-branch
+
+        git branch other-branch
+        touch second-file
+        git add second-file
+        git commit -m "Second commit."
+        
+        git checkout other-branch
+        touch new-file
+        git add new-file
+        git commit -m "Adding new-file."
+      SH
+    end
+
+    it "exists with a status of 1 and leaves the branch where it is" do
+      first_branch_before_ff = commit_named("first-branch")
+
+      run <<-SH
+        git checkout first-branch
+        git fast-forward other-branch
+      SH
+
+      $?.exitstatus.should == 1
+      commit_named("first-branch").should == first_branch_before_ff
+    end
+  end
+end

metadata

@@ -0,0 +1,64 @@
+--- !ruby/object:Gem::Specification 
+name: git-fast-forward
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 0
+  version: 0.0.0
+platform: ruby
+authors: 
+- Peter Jaros
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-10-02 00:00:00 -04:00
+default_executable: git-fast-forward
+dependencies: []
+
+description: Git command that works like merge, but never creates a merge commit.
+email: peter.a.jaros@gmail.com
+executables: 
+- git-fast-forward
+extensions: []
+
+extra_rdoc_files: 
+- README.markdown
+files: 
+- bin/git-fast-forward
+- lib/git-fast-forward.rb
+- README.markdown
+has_rdoc: true
+homepage: http://github.com/Peeja/git-fast-forward
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: Git command that works like merge, but never creates a merge commit.
+test_files: 
+- spec/git-fast-forward_spec.rb