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

[PATCH 0/4] fix log -L -M

From
Thomas Rast <trast@inf.ethz.ch>
Date
Apr 12, 2013, 16:05 UTC
Message-ID
<cover.1365781999.git.trast@inf.ethz.ch>
In-Reply-To
<87ppy0gjic.fsf@linux-k42r.v.cablecom.net>

Ok, so this was not quite as bad as I feared. The move support as far as I had thought to test it previously actually worked ok, it just wasn't tested (which is embarrassing enough).

The bug fixed in patch 3 is a bit more involved and only triggered by history that merges a rename with a modification to the original filename. Luckily -- I guess -- there are several cases of this happening in git.git around the big builtin/ move in 81b50f3 (Move 'builtin-*' into a 'builtin/' subdirectory, 2010-02-22). So my fuzz tests found that problem. You can reproduce with e.g.

  git log -M -L:cmd_format_patch:builtin/log.c
in any git.git.
Thomas Rast (4):
  t4211: pass -M to 'git log -M -L...' test
  log -L: test merge of parallel modify/rename
  log -L: store the path instead of a diff_filespec
  log -L: improve comments in process_all_files()
 line-log.c                               |  62 +++++++-----
 line-log.h                               |   8 +-
 t/t4211-line-log.sh                      |  18 +++-
 t/t4211/expect.move-support-f            |  56 +++++++++--
 t/t4211/expect.parallel-change-f-to-main | 160 +++++++++++++++++++++++++++++++
 t/t4211/history.export                   |  80 +++++++++++++++-
 6 files changed, 344 insertions(+), 40 deletions(-)
 create mode 100644 t/t4211/expect.parallel-change-f-to-main
-- 
1.8.2.1.567.g8ad0f43
Previous: Thomas RastNext: Thomas Rast
Message 4 of 8 in “What's cooking in git.git (Apr 2013, #02; Fri, 5)”
  1. Junio C HamanoApr 5, 2013
  2. John KeepingApr 7, 2013
  3. Thomas RastApr 12, 2013
  4. 0/4 fix log -L -MThomas Rast, Apr 12, 2013
  5. 1/4 t4211: pass -M to 'git log -M -L...' testThomas Rast, Apr 12, 2013
  6. 2/4 log -L: test merge of parallel modify/renameThomas Rast, Apr 12, 2013
  7. 3/4 log -L: store the path instead of a diff_filespecThomas Rast, Apr 12, 2013
  8. 4/4 log -L: improve comments in process_all_files()Thomas Rast, Apr 12, 2013

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.