From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 20 Jul 2007 07:37:43 +0000 (-0400)
Subject: git-gui: Simplify error case for unsupported merge types
X-Git-Tag: gitgui-0.8.0~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eea1ab6e23db4c929500fb11464a438b0ba569f0;p=git.git

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>
---

diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index 6d87830dd..554c10703 100644
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -208,7 +208,7 @@ method _update_ref {} {
 				}
 			}
 			default {
-				_error $this "Only 'ff' and 'reset' merge is currently supported."
+				_error $this "Merge strategy '$merge_type' not supported."
 				return 0
 			}
 			}