git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/5] apply: fix merge.conflictStyle bug in --3way

From
Denton Liu <liu.denton@gmail.com>
Date
Oct 23, 2019, 12:03 UTC
Message-ID
<cover.1571832176.git.liu.denton@gmail.com>

This fixes a bug where even if `merge.conflictStyle = diff3`, running `git apply --3way` would not output the base.

Patches 1-3 are general cleanup for t4108, 4 demonstrates the bug and 5 actually fixes it.

Denton Liu (5):
  t4108: replace create_file with test_write_lines
  t4108: remove git command upstream of pipe
  t4108: use `test_config` instead of `git config`
  t4108: demonstrate bug in apply
  apply: respect merge.conflictStyle in --3way
 apply.c                   |  2 +-
 t/t4108-apply-threeway.sh | 96 +++++++++++++++++++++------------------
 2 files changed, 53 insertions(+), 45 deletions(-)
-- 
2.24.0.rc0.197.g0926ab8072
Next: Denton Liu
Message 1 of 16 in “apply: fix merge.conflictStyle bug in --3way”
  1. 0/5 apply: fix merge.conflictStyle bug in --3wayDenton Liu, Oct 23, 2019
  2. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  3. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  4. Eric SunshineOct 23, 2019
  5. Denton LiuOct 23, 2019
  6. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  7. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  8. Eric SunshineOct 23, 2019
  9. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019
  10. Junio C HamanoOct 24, 2019
  11. 0/5 This fixes a bug where even if `merge.conflictStyle = diff3`, running `git apply --3way` would not output the base.Denton Liu, Oct 23, 2019
  12. 1/5 t4108: replace create_file with test_write_linesDenton Liu, Oct 23, 2019
  13. 2/5 t4108: remove git command upstream of pipeDenton Liu, Oct 23, 2019
  14. 3/5 t4108: use `test_config` instead of `git config`Denton Liu, Oct 23, 2019
  15. 4/5 t4108: demonstrate bug in applyDenton Liu, Oct 23, 2019
  16. 5/5 apply: respect merge.conflictStyle in --3wayDenton Liu, Oct 23, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.