fork of https://github.com/sourcegraph/zoekt
indexserver: preserve forced reindexing (#1060)
The default for zoekt-git-index has always been true for incremental.
However, we originally used to use zoekt-archive-index which defaulted
to false for incremental. This meant that since we stopped using archive
index (5 years ago!) forcing non-incremental indexing has always lead to
incremental indexing.
author
Keegan Carruthers-Smith
committer
GitHub
date
(May 14, 2026, 9:26 AM +0200)
commit
327cf11f
327cf11f64f0167cf3e5549cf910e2402487f76a
parent
2a1cee1a
2a1cee1ac057de4d43c0ce316b11fd3648c9ee25
+5
-7
+1
-3
cmd/zoekt-sourcegraph-indexserver/index.go
+1
-3
cmd/zoekt-sourcegraph-indexserver/index.go
···
389
389
// Even though we check for incremental in this process, we still pass it
390
390
// in just in case we regress in how we check in process. We will still
391
391
// notice thanks to metrics and increased load on gitserver.
392
-
if o.Incremental {
393
-
args = append(args, "-incremental")
394
-
}
392
+
args = append(args, fmt.Sprintf("-incremental=%v", o.Incremental))
395
393
396
394
var branches []string
397
395
for _, b := range o.Branches {
+4
-4
cmd/zoekt-sourcegraph-indexserver/index_test.go
+4
-4
cmd/zoekt-sourcegraph-indexserver/index_test.go
···
499
499
"git -C $TMPDIR/test%2Frepo.git config zoekt.public 0",
500
500
"git -C $TMPDIR/test%2Frepo.git config zoekt.repoid 0",
501
501
"git -C $TMPDIR/test%2Frepo.git config zoekt.tenantID 42",
502
-
"zoekt-git-index -submodules=false -branches HEAD -file_limit 1048576 -disable_ctags $TMPDIR/test%2Frepo.git",
502
+
"zoekt-git-index -submodules=false -incremental=false -branches HEAD -file_limit 1048576 -disable_ctags $TMPDIR/test%2Frepo.git",
503
503
},
504
504
}, {
505
505
name: "minimal-id",
···
526
526
"git -C $TMPDIR/test%2Frepo.git config zoekt.public 0",
527
527
"git -C $TMPDIR/test%2Frepo.git config zoekt.repoid 123",
528
528
"git -C $TMPDIR/test%2Frepo.git config zoekt.tenantID 1",
529
-
"zoekt-git-index -submodules=false -branches HEAD -file_limit 1048576 -disable_ctags $TMPDIR/test%2Frepo.git",
529
+
"zoekt-git-index -submodules=false -incremental=false -branches HEAD -file_limit 1048576 -disable_ctags $TMPDIR/test%2Frepo.git",
530
530
},
531
531
}, {
532
532
name: "all",
···
561
561
"git -C $TMPDIR/test%2Frepo.git config zoekt.public 0",
562
562
"git -C $TMPDIR/test%2Frepo.git config zoekt.repoid 0",
563
563
"git -C $TMPDIR/test%2Frepo.git config zoekt.tenantID 1",
564
-
"zoekt-git-index -submodules=false -incremental -branches HEAD,dev " +
564
+
"zoekt-git-index -submodules=false -incremental=true -branches HEAD,dev " +
565
565
"-file_limit 1048576 -parallelism 4 -index /data/index -require_ctags -large_file foo -large_file bar " +
566
566
"$TMPDIR/test%2Frepo.git",
567
567
},
···
612
612
"git -C $TMPDIR/test%2Frepo.git config zoekt.public 0",
613
613
"git -C $TMPDIR/test%2Frepo.git config zoekt.repoid 0",
614
614
"git -C $TMPDIR/test%2Frepo.git config zoekt.tenantID 1",
615
-
"zoekt-git-index -submodules=false -incremental -branches HEAD,dev,release " +
615
+
"zoekt-git-index -submodules=false -incremental=true -branches HEAD,dev,release " +
616
616
"-delta -delta_threshold 22 -file_limit 1048576 -parallelism 4 -index /data/index -require_ctags -large_file foo -large_file bar " +
617
617
"$TMPDIR/test%2Frepo.git",
618
618
},