From b66f4f7aa750ebebbd5186e1cafeee76df4691f8 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Wed, 19 Oct 2011 13:22:33 +0100
Subject: [PATCH] git-gui: catch invalid or complete regular expressions and
 treat as no match.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 lib/search.tcl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/search.tcl b/lib/search.tcl
index fe165724ed..db88d87c51 100644
--- a/lib/search.tcl
+++ b/lib/search.tcl
@@ -133,14 +133,16 @@ method _do_search {start {mlenvar {}} {dir {}} {endbound {}}} {
 		set dir $searchdirn
 	}
 	lappend cmd $dir -- $searchstring
-	if {$endbound ne {}} {
-		set here [eval $cmd [list $start] [list $endbound]]
-	} else {
-		set here [eval $cmd [list $start]]
-		if {$here eq {}} {
-			set here [eval $cmd [_get_wrap_anchor $this $dir]]
+	if {[catch {
+		if {$endbound ne {}} {
+			set here [eval $cmd [list $start] [list $endbound]]
+		} else {
+			set here [eval $cmd [list $start]]
+			if {$here eq {}} {
+				set here [eval $cmd [_get_wrap_anchor $this $dir]]
+			}
 		}
-	}
+	} err]} { set here {} }
 	return $here
 }
 
-- 
2.11.4.GIT