revision: factor out initialization of diff-merge related settings
Move initialization code related to diffing merges into new init_diff_merge_revs() function. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
027c4783d73bbaff0a3c494b886cd8fa20ba8372
1 file changed
+8
-1
revision.c
+8
-1
@@ -1805,6 +1805,8 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1805
return 1;
1806
}
1807
1808
+static void init_diff_merge_revs(struct rev_info *revs);
1809
+
1810
void repo_init_revisions(struct repository *r,
1811
struct rev_info *revs,
1812
const char *prefix)
@@ -1813,7 +1815,7 @@ void repo_init_revisions(struct repository *r,
1815
1816
revs->repo = r;
1817
revs->abbrev = DEFAULT_ABBREV;
1816
- revs->ignore_merges = -1;
1818
+ init_diff_merge_revs(revs);
1819
revs->simplify_history = 1;
1820
revs->pruning.repo = r;
1821
revs->pruning.flags.recursive = 1;
@@ -2153,6 +2155,11 @@ static void add_message_grep(struct rev_info *revs, const char *pattern)
2155
add_grep(revs, pattern, GREP_PATTERN_BODY);
2156
}
2157
2158
+static void init_diff_merge_revs(struct rev_info *revs)
2159
+{
2160
+ revs->ignore_merges = -1;
2161
+}
2162
+
2163
static int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
2164
{
2165
int argcount = 1;