diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2020-07-10 17:19:52 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-07-10 13:53:37 -0700 |
| commit | de966e39a8ba585e6cb0483c49e562c2f6eb3f77 (patch) | |
| tree | 1ee638601747260cfd4c89213b63b5b152c9f617 /builtin/bisect--helper.c | |
| parent | t3432: use git-reflog to inspect the reflog for HEAD (diff) | |
| download | tgif-de966e39a8ba585e6cb0483c49e562c2f6eb3f77.tar.xz | |
bisect: treat BISECT_HEAD as a pseudo ref
Both the git-bisect.sh as bisect--helper inspected the file system
directly.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/bisect--helper.c')
| -rw-r--r-- | builtin/bisect--helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index ec4996282e..73f9324ad7 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -13,7 +13,6 @@ static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") 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_head, "BISECT_HEAD") 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") @@ -164,7 +163,7 @@ static int bisect_reset(const char *commit) strbuf_addstr(&branch, commit); } - if (!file_exists(git_path_bisect_head())) { + if (!ref_exists("BISECT_HEAD")) { struct argv_array argv = ARGV_ARRAY_INIT; argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL); |