mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-merges: introduce log.diffMerges config variable

Browse Source 
New log.diffMerges configuration variable sets the format that
--diff-merges=on will be using. The default is "separate".

t4013: add the following tests for log.diffMerges config:

* Test that wrong values are denied.

* Test that the value of log.diffMerges properly affects both
--diff-merges=on and -m.

t9902: fix completion tests for log.d* to match log.diffMerges.

Added documentation for log.diffMerges.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov
2021-04-13 14:41:17 +03:00
committed by Junio C Hamano
parent 38fc4dbbc2
commit 17c13e60fd
6 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
diff-merges.c
View File

@ -90,6 +90,17 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
* Public functions. They are in the order they are called.
*/
int diff_merges_config(const char *value)
{
diff_merges_setup_func_t func = func_by_opt(value);
if (!func)
return -1;
set_to_default = func;
return 0;
}
int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
{
int argcount = 1;