aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2022-11-10 23:36:45 +0700
committerTaylor Blau <me@ttaylorr.com>2022-11-11 17:06:01 -0500
commit0da4b538e40f38f2ee7adc625cac18ae0d8df4d1 (patch)
treed52e240eb799483d0093ab10e323b5292a4aa2d4
parentdf63421be927c689bbd9384d503768c0515063c4 (diff)
downloadgit-0da4b538e40f38f2ee7adc625cac18ae0d8df4d1.tar.xz
bisect--helper: log: allow arbitrary number of arguments
In a later change, we would like to turn bisect into a builtin by renaming bisect--helper. However, there's an oddity that "git bisect log" accepts any number of arguments and it will just ignore them all. Let's prepare for the next step by ignoring any arguments passed to "git bisect--helper log" Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
-rw-r--r--builtin/bisect--helper.c4
-rwxr-xr-xgit-bisect.sh2
2 files changed, 1 insertions, 5 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 29d5a26c64..6066f553fd 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -1347,10 +1347,8 @@ static int cmd_bisect__next(int argc, const char **argv UNUSED, const char *pref
return res;
}
-static int cmd_bisect__log(int argc, const char **argv UNUSED, const char *prefix UNUSED)
+static int cmd_bisect__log(int argc UNUSED, const char **argv UNUSED, const char *prefix UNUSED)
{
- if (argc)
- return error(_("'%s' requires 0 arguments"), "git bisect log");
return bisect_log();
}
diff --git a/git-bisect.sh b/git-bisect.sh
index 9f6c8cc093..f95b8103a9 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -57,8 +57,6 @@ case "$#" in
case "$cmd" in
help)
git bisect -h ;;
- log)
- git bisect--helper log || exit ;;
*)
git bisect--helper "$cmd" "$@" ;;
esac