summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:52 -0700
commit1b7a91da71d42759dfb83fa3a17be54ad01f0132 (patch)
tree921c80479f0f12a95114b0b32f6fdfa928f170c8 /builtin/branch.c
parentMerge branch 'sb/submodule-update-in-c' (diff)
parentcommit-reach: correct accidental #include of C file (diff)
downloadtgif-1b7a91da71d42759dfb83fa3a17be54ad01f0132.tar.xz
Merge branch 'ds/reachable'
The code for computing history reachability has been shuffled, obtained a bunch of new tests to cover them, and then being improved. * ds/reachable: commit-reach: correct accidental #include of C file commit-reach: use can_all_from_reach commit-reach: make can_all_from_reach... linear commit-reach: replace ref_newer logic test-reach: test commit_contains test-reach: test can_all_from_reach_with_flags test-reach: test reduce_heads test-reach: test get_merge_bases_many test-reach: test is_descendant_of test-reach: test in_merge_bases test-reach: create new test tool for ref_newer commit-reach: move can_all_from_reach_with_flags upload-pack: generalize commit date cutoff upload-pack: refactor ok_to_give_up() upload-pack: make reachable() more generic commit-reach: move commit_contains from ref-filter commit-reach: move ref_newer from remote.c commit.h: remove method declarations commit-reach: move walk methods from commit.c
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 5b4d883e1f..c396c41533 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -23,6 +23,7 @@
#include "ref-filter.h"
#include "worktree.h"
#include "help.h"
+#include "commit-reach.h"
static const char * const builtin_branch_usage[] = {
N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),