Re: [PATCH v3 0/2] Allow disabling advice shown after merge conflicts

Phillip Wood [off-list ref] writes:

Hi Philippe

On 16/03/2024 21:16, Philippe Blain via GitGitGadget wrote:

quoted

Changes since v2:
  * expanded the commit messages to explain why the tests for 'git
rebase' do
    not need to be adjusted
  * adjusted the wording of the new 'advice.mergeConflict' in the doc, as
    suggested by Kristoffer for uniformity with his series which is already
    merged to 'master' (b09a8839a4 (Merge branch
    'kh/branch-ref-syntax-advice', 2024-03-15)).
  * checked all new output manually and consequently adjusted the code in 1/2
    to avoid a lonely 'hint: ' line.
  * adjusted the addition in advice.h in 1/2 to put the new enum
    alphabetically, as noticed by Rubén.
  * added misssing newlines in 2/2 as noticed by Phillip and tweaked by
    Junio.
  * rebased on master (2953d95d40 (The eighth batch, 2024-03-15)), to avoid
    conflicts in 'Documentation/config/advice.txt' due to Kristoffer's merged >     series
[...] Note that the code path where 'git rebase --apply' stops
because of
conflicts is not covered by the tests but I tested it manually using this
diff:

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 47534f1062..34eac2e6f4 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh

@@ -374,7 +374,7 @@ test_pull_autostash_fail ()
      echo conflicting >>seq.txt &&
      test_tick &&
      git commit -m "Create conflict" seq.txt &&
-	test_must_fail git pull --rebase . seq 2>err >out &&
+	test_must_fail git -c rebase.backend=apply pull --rebase . seq 2>err >out &&
      test_grep "Resolve all conflicts manually" err
  '

Thanks for being so thorough, this version looks good to me

Yup, these look good.  Let's mark the topic for 'next'.

Thanks, both.