timcharper / git-tmbundle fork watch download tarball
public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git 
bugfix - git 1.5.5 changed the warning for branch switching from fatal to 
error, resulting in a no longer functioning 'Conflicts may happen if you 
switch... proceed anyways?' feature.
timcharper (author)
Thu Apr 24 16:21:16 -0700 2008
commit  f6ee94f6d9dc3d52387ff07d6f3d37fd0e3ffdaa
tree    67fc0364e37e89d875aa797e4e457e90a436d18f
parent  ec7c30181dc2be60a716b3f3af78f401d8671cb6
0
Support/app/controllers/branch_controller.rb 
...
149
150
151
152
 
153
154
155
 
...
149
150
151
 
152
153
154
155
 
0
@@ -149,7 +149,7 @@ class BranchController < ApplicationController
0
       when /fatal: you need to resolve your current index first/
0
         TextMate::UI.alert(:warning, "Error - couldn't switch", "Git said:\n#{output}\nYou're probably in the middle of a conflicted merge, and need to commit", "OK")
0
         exit_discard
0
-      when /fatal: Entry '(.+)' not uptodate\. Cannot merge\./
0
+      when /(fatal|error): Entry '(.+)' not uptodate\. Cannot merge\./
0
         response = TextMate::UI.alert(:informational, "Conflicts may happen if you switch", "There are uncommitted changes that might cause conflicts by this switch (#{$1}).\nSwitch anyways?", "No", "Yes")
0
         if response=="Yes"
0
           output = git.command("checkout", "-m", target_branch)

Comments

    No one has commented yet.