Fixed git-wtf so it doesn't show orphaned branches

Author: jwiegley

git-wtf

@@ -96,16 +96,18 @@ def show b, all_branches
   if $config["versions"].include? b[:remote_branch]
     puts "\nFeature branches:" unless fbs.empty?
     fbs.each do |name, br|
-      remote_ahead = commits_between b[:remote_branch], br[:local_branch]
-      local_ahead = commits_between b[:local_branch], br[:local_branch]
-      if local_ahead.empty? && remote_ahead.empty?
-        puts "[x] #{br[:name]} is merged in"
-      elsif local_ahead.empty?
-        puts "(x) #{br[:name]} merged in (only locally)"
-      else
-        behind = commits_between br[:local_branch], b[:remote_branch]
-        puts "[ ] #{br[:name]} is NOT merged in (#{ahead_behind_string local_ahead, behind})"
-        show_commits local_ahead, nil, "   "
+      if not `git merge-base #{b[:remote_branch]} #{br[:local_branch]}`.split("\n").empty?
+        remote_ahead = commits_between b[:remote_branch], br[:local_branch]
+        local_ahead = commits_between b[:local_branch], br[:local_branch]
+        if local_ahead.empty? && remote_ahead.empty?
+          puts "[x] #{br[:name]} is merged in"
+        elsif local_ahead.empty?
+          puts "(x) #{br[:name]} merged in (only locally)"
+        else
+          behind = commits_between br[:local_branch], b[:remote_branch]
+          puts "[ ] #{br[:name]} is NOT merged in (#{ahead_behind_string local_ahead, behind})"
+          show_commits local_ahead, nil, "   "
+        end
       end
     end
   else