]> git.ipfire.org Git - thirdparty/git.git/commitdiff
bisect: remove Cogito-related code
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 12 Jan 2023 15:19:13 +0000 (16:19 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jan 2023 22:17:14 +0000 (14:17 -0800)
Once upon a time, there was this idea that Git would not actually be a
single coherent program, but rather a set of low-level programs that
users cobble together via shell scripts, or develop high-level user
interfaces for Git, or both.

Cogito was such a high-level user interface, incidentally implemented
via shell scripts that cobble together Git calls.

It did turn out relatively quickly that Git would much rather provide a
useful high-level user interface itself.

As of April 19th, 2007, Cogito was therefore discontinued (see
https://lore.kernel.org/git/20070419124648.GL4489@pasky.or.cz/).

Nevertheless, for almost 15 years after that announcement, Git carried
special code in `git bisect` to accommodate Cogito.

Since it is beyond doubt that there are no more Cogito users, let's
remove the last remnant of Cogito-accommodating code.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/bisect.c

index 0786ebf4012e292a1fbe6ac536ef34df89ae4f45..73017402671d30ce7f868a9691f9bb6f520695e1 100644 (file)
@@ -15,7 +15,6 @@ static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
-static GIT_PATH_FUNC(git_path_head_name, "head-name")
 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
 static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
@@ -808,13 +807,6 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, int argc,
                        strbuf_addstr(&start_head, oid_to_hex(&head_oid));
                } else if (!get_oid(head, &head_oid) &&
                           skip_prefix(head, "refs/heads/", &head)) {
-                       /*
-                        * This error message should only be triggered by
-                        * cogito usage, and cogito users should understand
-                        * it relates to cg-seek.
-                        */
-                       if (!is_empty_or_missing_file(git_path_head_name()))
-                               return error(_("won't bisect on cg-seek'ed tree"));
                        strbuf_addstr(&start_head, head);
                } else {
                        return error(_("bad HEAD - strange symbolic ref"));