| Message ID | 20210413114118.25693-5-sorganov@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 17c13e60fd799336b28d320dcba06fe1ef06e01d |
| Headers | show |
| Series | [v2,1/5] diff-merges: introduce --diff-merges=on | expand |
Sergey Organov <sorganov@gmail.com> writes: > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > index 04ce884ef5ac..4d732d6d4f81 100755 > --- a/t/t9902-completion.sh > +++ b/t/t9902-completion.sh > @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' ' > test_completion "git config log.d" <<-\EOF > log.date Z > log.decorate Z > + log.diffMerges Z > EOF > ' > > @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' ' > test_completion "git -c log.d" <<-\EOF > log.date=Z > log.decorate=Z > + log.diffMerges=Z > EOF > ' > > @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' ' > test_completion "git clone --config=log.d" <<-\EOF > log.date=Z > log.decorate=Z > + log.diffMerges=Z > EOF > ' $ sh ./t9902-completion.sh -i -v ends like the attached. Is there a prerequisite patch I am missing, or something? ok 195 - git config - section expecting success of 9902.196 'git config - variable name': test_completion "git config log.d" <<-\EOF log.date Z log.decorate Z log.diffMerges Z EOF --- expected 2021-04-15 20:20:09.652861741 +0000 +++ out_sorted 2021-04-15 20:20:09.660862400 +0000 @@ -1,3 +1,2 @@ log.date log.decorate -log.diffMerges not ok 196 - git config - variable name # # test_completion "git config log.d" <<-\EOF # log.date Z # log.decorate Z # log.diffMerges Z # EOF # :
Junio C Hamano <gitster@pobox.com> writes: > Sergey Organov <sorganov@gmail.com> writes: > >> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh >> index 04ce884ef5ac..4d732d6d4f81 100755 >> --- a/t/t9902-completion.sh >> +++ b/t/t9902-completion.sh >> @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' ' >> test_completion "git config log.d" <<-\EOF >> log.date Z >> log.decorate Z >> + log.diffMerges Z >> EOF >> ' >> >> @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' ' >> test_completion "git -c log.d" <<-\EOF >> log.date=Z >> log.decorate=Z >> + log.diffMerges=Z >> EOF >> ' >> >> @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' ' >> test_completion "git clone --config=log.d" <<-\EOF >> log.date=Z >> log.decorate=Z >> + log.diffMerges=Z >> EOF >> ' > > $ sh ./t9902-completion.sh -i -v > > ends like the attached. Is there a prerequisite patch I am missing, > or something? To me these completion tests don't work as expected unless I "make install; make test" resulting Git version rather than simply "make tests". I have been told this by SZEDER Gábor <szeder.dev@gmail.com> earlier in the discussion of these patch series: <quote> It might be related to a bug in the build process that doesn't update that auto-generated list of supported configuration variables after e.g. 'Documentation/config/log.txt' was modified; see a proposed fix at: https://public-inbox.org/git/20210408212915.3060286-1-szeder.dev@gmail.com/ </quote> Looks like that's it? For reference, I've checked all the commits in the series with this script: #!/usr/bin/env bash while read -r rev; do git checkout "$rev" make clean > /dev/null 2>&1 commit=$(git log --oneline --abbrev=6 -n1 $rev) echo "Make $commit" if ! make prefix=$HOME/git -j8 all >/dev/null 2>&1; then >&2 echo "Make for commit $rev failed" exit 1 fi echo "Install $commit" if ! make prefix=$HOME/git install>/dev/null 2>&1; then >&2 echo "Install for commit $rev failed" exit 2 fi echo "Test $commit" if ! make test; then >&2 echo "Test for commit $rev failed" exit 3 fi done < <(git rev-list --reverse "$1") -- Sergey Organov
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 208d5fdcaa68..456eb07800cb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -24,6 +24,11 @@ log.excludeDecoration:: the config option can be overridden by the `--decorate-refs` option. +log.diffMerges:: + Set default diff format to be used for merge commits. See + `--diff-merges` in linkgit:git-log[1] for details. + Defaults to `separate`. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, diff --git a/builtin/log.c b/builtin/log.c index 8acd285dafd8..6102893fccb9 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -481,6 +481,8 @@ static int git_log_config(const char *var, const char *value, void *cb) decoration_style = 0; /* maybe warn? */ return 0; } + if (!strcmp(var, "log.diffmerges")) + return diff_merges_config(value); if (!strcmp(var, "log.showroot")) { default_show_root = git_config_bool(var, value); return 0; diff --git a/diff-merges.c b/diff-merges.c index 9d19225b3ec9..f3a9daed7e05 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -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; diff --git a/diff-merges.h b/diff-merges.h index 659467c99a4f..09d9a6c9a4fb 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -9,6 +9,8 @@ struct rev_info; +int diff_merges_config(const char *value); + int diff_merges_parse_opts(struct rev_info *revs, const char **argv); void diff_merges_suppress(struct rev_info *revs); diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 26a7b4d19d4d..87def81699bf 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -460,6 +460,29 @@ test_expect_success 'log --diff-merges=on matches --diff-merges=separate' ' test_cmp expected actual ' +test_expect_success 'deny wrong log.diffMerges config' ' + test_config log.diffMerges wrong-value && + test_expect_code 128 git log +' + +test_expect_success 'git config log.diffMerges first-parent' ' + git log -p --diff-merges=first-parent master >result && + process_diffs result >expected && + test_config log.diffMerges first-parent && + git log -p --diff-merges=on master >result && + process_diffs result >actual && + test_cmp expected actual +' + +test_expect_success 'git config log.diffMerges first-parent vs -m' ' + git log -p --diff-merges=first-parent master >result && + process_diffs result >expected && + test_config log.diffMerges first-parent && + git log -p -m master >result && + process_diffs result >actual && + test_cmp expected actual +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S ' diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 04ce884ef5ac..4d732d6d4f81 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' ' test_completion "git config log.d" <<-\EOF log.date Z log.decorate Z + log.diffMerges Z EOF ' @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' ' test_completion "git -c log.d" <<-\EOF log.date=Z log.decorate=Z + log.diffMerges=Z EOF ' @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' ' test_completion "git clone --config=log.d" <<-\EOF log.date=Z log.decorate=Z + log.diffMerges=Z EOF '
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> --- Documentation/config/log.txt | 5 +++++ builtin/log.c | 2 ++ diff-merges.c | 11 +++++++++++ diff-merges.h | 2 ++ t/t4013-diff-various.sh | 23 +++++++++++++++++++++++ t/t9902-completion.sh | 3 +++ 6 files changed, 46 insertions(+)