gitk: Skip over AUTHOR/COMMIT_DATE when searching all fields

This prevents a search for a number like "105" on "All Fields" from
matching against the raw author and commit timestamps.  These
timestamps were already not searchable by themselves, and the
displayed format does not match the query string anyway.

Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index fc54f431f18a4ab72bb03a351ea79998629bb100..5e3ad158837c6878eb08b0307da126bb1e8c5da9 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -4659,8 +4659,9 @@ proc askfindhighlight {row id} {
     }
     set info $commitinfo($id)
     set isbold 0
     }
     set info $commitinfo($id)
     set isbold 0

-    set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]]
+    set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]

     foreach f $info ty $fldtypes {
     foreach f $info ty $fldtypes {

+       if {$ty eq ""} continue

        if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
            [doesmatch $f]} {
            if {$ty eq [mc "Author"]} {
        if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
            [doesmatch $f]} {
            if {$ty eq [mc "Author"]} {


@@ -6521,7 +6522,7 @@ proc findmore {} {
     if {![info exists find_dirn]} {
        return 0
     }
     if {![info exists find_dirn]} {
        return 0
     }

-    set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]]
+    set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]

     set l $findcurline
     set moretodo 0
     if {$find_dirn > 0} {
     set l $findcurline
     set moretodo 0
     if {$find_dirn > 0} {


@@ -6582,6 +6583,7 @@ proc findmore {} {
            }
            set info $commitinfo($id)
            foreach f $info ty $fldtypes {
            }
            set info $commitinfo($id)
            foreach f $info ty $fldtypes {

+               if {$ty eq ""} continue

                if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
                    [doesmatch $f]} {
                    set found 1
                if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
                    [doesmatch $f]} {
                    set found 1