@matheusbsbs / matheus-bagliano / commits / eea1ab6e23
Fork 0

git-gui: Simplify error case for unsupported merge types

If we are given a merge type we don't understand in checkout_op there is probably a bug in git-gui somewhere that allowed this unknown merge strategy to come into this part of the code path. We currently only recognize three merge types ('none', 'ff' and 'reset') but are going to be supporting more in the future. Rather than keep editing this message I'm going with a very generic "Uh, we don't do that!" type of error. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jul 20, 2007 at 03:37 UTC eea1ab6e23db4c929500fb11464a438b0ba569f0
1 file changed +1 -1
lib/checkout_op.tcl
+1 -1
@@ -208,7 +208,7 @@ method _update_ref {} {
208 }
209 }
210 default {
211 - _error $this "Only 'ff' and 'reset' merge is currently supported."
211 + _error $this "Merge strategy '$merge_type' not supported."
212 return 0
213 }
214 }