git-gui: Always use lsearch -exact, to prevent globbing.

diff --git a/git-gui.sh b/git-gui.sh
index 7792eb4d7fdeb9ed646ecc2be87a00f0aeb9f6ee..b203c56a98a49c7344a9146e2c76af4e7f2adc27 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -568,7 +568,7 @@ proc reshow_diff {} {
        if {$p eq {}
                || $current_diff_side eq {}
                || [catch {set s $file_states($p)}]
-               || [lsearch -sorted $file_lists($current_diff_side) $p] == -1} {
+               || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
                clear_diff
        } else {
                show_diff $p $current_diff_side
@@ -607,16 +607,13 @@ proc show_diff {path w {lno {}}} {
        if {$diff_active || ![lock_index read]} return
 
        clear_diff
-       if {$w eq {} || $lno == {}} {
-               foreach w [array names file_lists] {
-                       set lno [lsearch -sorted $file_lists($w) $path]
-                       if {$lno >= 0} {
-                               incr lno
-                               break
-                       }
+       if {$lno == {}} {
+               set lno [lsearch -sorted -exact $file_lists($w) $path]
+               if {$lno >= 0} {
+                       incr lno
                }
        }
-       if {$w ne {} && $lno >= 1} {
+       if {$lno >= 1} {
                $w tag add in_diff $lno.0 [expr {$lno + 1}].0
        }
 
@@ -1430,7 +1427,7 @@ proc display_file_helper {w path icon_name old_m new_m} {
        global file_lists
 
        if {$new_m eq {_}} {
-               set lno [lsearch -sorted $file_lists($w) $path]
+               set lno [lsearch -sorted -exact $file_lists($w) $path]
                if {$lno >= 0} {
                        set file_lists($w) [lreplace $file_lists($w) $lno $lno]
                        incr lno
@@ -1441,7 +1438,7 @@ proc display_file_helper {w path icon_name old_m new_m} {
        } elseif {$old_m eq {_} && $new_m ne {_}} {
                lappend file_lists($w) $path
                set file_lists($w) [lsort -unique $file_lists($w)]
-               set lno [lsearch -sorted $file_lists($w) $path]
+               set lno [lsearch -sorted -exact $file_lists($w) $path]
                incr lno
                $w conf -state normal
                $w image create $lno.0 \
@@ -2145,7 +2142,7 @@ Delete the selected branches?}
                if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
                        append failed " - $b: $err\n"
                } else {
-                       set x [lsearch -sorted $all_heads $b]
+                       set x [lsearch -sorted -exact $all_heads $b]
                        if {$x >= 0} {
                                set all_heads [lreplace $all_heads $x $x]
                        }
@@ -2271,6 +2268,13 @@ The rescan will be automatically started now.
                return
        }
 
+       # -- Don't do a pointless switch.
+       #
+       if {$current_branch eq $new_branch} {
+               unlock_index
+               return
+       }
+
        if {$repo_config(gui.trustmtime) eq {true}} {
                switch_branch_stage2 {} $new_branch
        } else {