diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:54 -0700 |
| commit | 6d56d4c7dcd667d28aec28498591723c6febea1c (patch) | |
| tree | 1d583dce7f1063b570c4d18f223c1ec7b9473836 /builtin/merge.c | |
| parent | Merge branch 'gs/commit-graph-path-filter' (diff) | |
| parent | test-bloom: check that we have expected arguments (diff) | |
| download | tgif-6d56d4c7dcd667d28aec28498591723c6febea1c.tar.xz | |
Merge branch 'ds/blame-on-bloom'
"git blame" learns to take advantage of the "changed-paths" Bloom
filter stored in the commit-graph file.
* ds/blame-on-bloom:
test-bloom: check that we have expected arguments
test-bloom: fix some whitespace issues
blame: drop unused parameter from maybe_changed_path
blame: use changed-path Bloom filters
tests: write commit-graph with Bloom filters
revision: complicated pathspecs disable filters
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f78ac752b7..97066a5632 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -40,6 +40,7 @@ #include "branch.h" #include "commit-reach.h" #include "wt-status.h" +#include "commit-graph.h" #define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_OCTOPUS (1<<1) @@ -1700,9 +1701,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) head_commit); } - if (squash) + if (squash) { finish(head_commit, remoteheads, NULL, NULL); - else + + git_test_write_commit_graph_or_die(); + } else write_merge_state(remoteheads); if (merge_was_ok) |