Detect the proper merge location using config

Author: Evan Phoenix

.gitignore

@@ -0,0 +1 @@
+.*.swp

enhance.rb

@@ -75,5 +75,16 @@ def am_info
     def to_be_committed
       @git.diff_index({:cached => true, :name_only => true}, "HEAD").split("\n")
     end
+
+    def path2ref(name)
+      name.gsub %r!^refs/heads/!, ""
+    end
+
+    def merge_ref(branch)
+      repo = @git.config({}, "branch.#{branch}.remote").strip
+      ref =  @git.config({}, "branch.#{branch}.merge").strip
+      path = "#{repo}/#{path2ref(ref)}"
+      return path
+    end
   end
 end

git-update.rb

@@ -35,8 +35,11 @@
 
 STDOUT.sync = true
 
-top = `git rev-parse --show-cdup 2>&1`.strip
+# cd to the top of this git tree. If run via git's alias
+# infrastructure, this is done for us. We do it again, just
+# to be sure.
 
+top = `git rev-parse --show-cdup 2>&1`.strip
 Dir.chdir top unless top.empty?
 
 repo = Grit::Repo.new(".")
@@ -48,16 +51,20 @@
 # TODO parse +out+ for details to show the user.
 
 current = repo.resolve_rev "HEAD"
-origin = repo.resolve_rev "origin"
-
 branch = repo.git.symbolic_ref({:q => true}, "HEAD").strip
 
+branch_name = branch.gsub %r!^refs/heads/!, ""
+
+origin_ref = repo.merge_ref branch_name
+origin = repo.resolve_rev origin_ref
+
 common = repo.find_ancestor(origin, current)
 
 to_replay = repo.revs_between(common, current)
 to_receive = repo.revs_between(common, origin)
 
 if opts.analyze
+  puts "Automatically merging in refs from: #{origin_ref} / #{origin[0,7]}"
   puts "Closest ancestor between HEAD and origin: #{common[0,7]}"
   puts
 
@@ -68,7 +75,7 @@
 
   puts "#{to_receive.size} new commits."
   if opts.verbose
-    system "git log --pretty=oneline #{common}..origin"
+    system "git log --pretty=oneline #{common}..#{origin_ref}"
     puts
   end