[PATCH 0/9] Resend of gitster/pb/bisect
From: Pranit Bauva <hidden>
Date: 2016-07-12 22:41:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
Hey Junio, A small mistake got unnoticed by me which Lars recently pointed out. The naming convention is "git_path_<name_of_file>" and underscore instead of spaces. Thanks! The interdiff is:
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c2f3cee..88a1df8 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c@@ -7,7 +7,7 @@ #include "argv-array.h" #include "run-command.h" -static GIT_PATH_FUNC(git_path_bisect_write_terms, "BISECT_TERMS") +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_log, "BISECT_LOG")
@@ -100,7 +100,7 @@ static int write_terms(const char *bad, const char *good) if (check_term_format(bad, "bad") || check_term_format(good, "good")) return -1; - fp = fopen(git_path_bisect_write_terms(), "w"); + fp = fopen(git_path_bisect_terms(), "w"); if (!fp) return error_errno(_("could not open the file BISECT_TERMS"));
@@ -134,7 +134,7 @@ static int bisect_clean_state(void) remove_path(git_path_bisect_log()); remove_path(git_path_bisect_names()); remove_path(git_path_bisect_run()); - remove_path(git_path_bisect_write_terms()); + remove_path(git_path_bisect_terms()); /* Cleanup head-name if it got left by an old version of git-bisect */ remove_path(git_path_head_name()); /*
Pranit Bauva (9):
bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
bisect: rewrite `check_term_format` shell function in C
bisect--helper: `write_terms` shell function in C
bisect--helper: `bisect_clean_state` shell function in C
t6030: explicitly test for bisection cleanup
wrapper: move is_empty_file() and rename it as
is_empty_or_missing_file()
bisect--helper: `bisect_reset` shell function in C
bisect--helper: `is_expected_rev` & `check_expected_revs` shell
function in C
bisect--helper: `bisect_write` shell function in C
builtin/am.c | 20 +--
builtin/bisect--helper.c | 310 +++++++++++++++++++++++++++++++++++++++++++-
cache.h | 3 +
git-bisect.sh | 146 +++------------------
t/t6030-bisect-porcelain.sh | 17 +++
wrapper.c | 13 ++
6 files changed, 355 insertions(+), 154 deletions(-)
--
2.9.0