path: root/builtin/fmt-merge-msg.c
diff options
authorJunio C Hamano <>2018-09-17 20:53:52 (GMT)
committerJunio C Hamano <>2018-09-17 20:53:52 (GMT)
commit1b7a91da71d42759dfb83fa3a17be54ad01f0132 (patch)
tree921c80479f0f12a95114b0b32f6fdfa928f170c8 /builtin/fmt-merge-msg.c
parent4d6d6ef1fcce0e7d1fd2d3d38c2372998a105e96 (diff)
parent6621c838743812aaba96e55cfec8524ea1144c2d (diff)
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/fmt-merge-msg.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index f35ff16..e5668f2 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -12,6 +12,7 @@
#include "fmt-merge-msg.h"
#include "gpg-interface.h"
#include "repository.h"
+#include "commit-reach.h"
static const char * const fmt_merge_msg_usage[] = {
N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"),