diff options
| author |  Jon Seymour <jon.seymour@gmail.com> | 2011-08-04 22:01:00 +1000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-04 15:34:32 -0700 |
| commit | fee92fc1dd4480d9d5c72bd67243d3f6a9b03132 (patch) | |
| tree | 20e7a67037fd6243293efd49be4a81786b3b0247 /builtin | |
| parent | bisect: add tests to document expected behaviour in presence of broken trees. (diff) | |
| download | tgif-fee92fc1dd4480d9d5c72bd67243d3f6a9b03132.tar.xz | |
bisect: introduce support for --no-checkout option.
If --no-checkout is specified, then the bisection process uses:
git update-ref --no-deref HEAD <trial>
at each trial instead of:
git checkout <trial>
Improved-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/bisect--helper.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 5b226399e1..8d325a5179 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -4,16 +4,19 @@ #include "bisect.h" static const char * const git_bisect_helper_usage[] = { - "git bisect--helper --next-all", + "git bisect--helper --next-all [--no-checkout]", NULL }; int cmd_bisect__helper(int argc, const char **argv, const char *prefix) { int next_all = 0; + int no_checkout = 0; struct option options[] = { OPT_BOOLEAN(0, "next-all", &next_all, "perform 'git bisect next'"), + OPT_BOOLEAN(0, "no-checkout", &no_checkout, + "update BISECT_HEAD instead of checking out the current commit"), OPT_END() }; @@ -24,5 +27,5 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) usage_with_options(git_bisect_helper_usage, options); /* next-all */ - return bisect_next_all(prefix); + return bisect_next_all(prefix, no_checkout); } |