Skip to content

git log -L, cleaned up and (hopefully) fixed

Thomas Rast git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8Refactor parse_locMakefile builtin/blame.c line.c +2 more+145 -910 replies
2/8Export three functions from diff.cdiff.c diff.h+20 -30 replies
3/8Export rewrite_parents() for 'log -L'revision.c revision.h+14 -90 replies
4/8Implement line-history search (git log -L)Documentation/blame-options.txt Documentation/git-log.txt Documentation/line-range-format.txt +6 more+2186 -241 reply
5/8log -L: support parent rewritingline.c revision.c revision.h +1 more+357 -310 replies
6/8log -L: add --graph prefix before outputline.c+48 -180 replies
7/8log -L: add --full-line-diff optionDocumentation/git-log.txt builtin/log.c line.c +2 more+31 -80 replies
8/8log -L: implement move/copy detection (-M/-C)line.c t/t4303-log-line-move-detect.sh t/t4304-log-line-copy-detect.sh+1001 -130 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH v6.1 0/8] git log -L, cleaned up and (hopefully) fixed
Quoted 11 lines · Junio C Hamano

This patch set has too many whitespace errors, and worse yet, cannot be applied with "git am --whitespace=fix" because it has test vectors that depend on having "SP followed by HT" (context lines of diff output) and traling SP (graph output).

Could you please straighten that out first?

My preference is to protect offending whitespaces like this:

	sed -e 's/Q/ /g' -e 's/Z$//' >expected-no-M <<\EOF

[...]

Quoted 1 line

which has an added benefit of making them more visible.

Sorry for the mess. I stuck to the s/#$// style I already had in some places for now, but used the Qs and ran the rest through whitespace=fix. It now applies cleanly to master.

Bo Yang (8):
Refactor parse_loc
Export three functions from diff.c
Export rewrite_parents() for 'log -L'
Implement line-history search (git log -L)
log -L: support parent rewriting
log -L: add --graph prefix before output
log -L: add --full-line-diff option
log -L: implement move/copy detection (-M/-C)

 Documentation/blame-options.txt     |   19 +-
 Documentation/git-log.txt           |   22 +
 Documentation/line-range-format.txt |   18 +
 Makefile                            |    2 +
 builtin/blame.c                     |   99 +--
 builtin/log.c                       |   79 ++-
 diff.c                              |    6 +-
 diff.h                              |   17 +
 line.c                              | 2153 +++++++++++++++++++++++++++++++++++
 line.h                              |   72 ++
 revision.c                          |   22 +-
 revision.h                          |   23 +-
 t/t4301-log-line-single-history.sh  |  685 +++++++++++
 t/t4302-log-line-merge-history.sh   |  174 +++
 t/t4303-log-line-move-detect.sh     |  238 ++++
 t/t4304-log-line-copy-detect.sh     |  220 ++++
 t/t8003-blame-corner-cases.sh       |    6 +
 17 files changed, 3730 insertions(+), 125 deletions(-)
 create mode 100644 Documentation/line-range-format.txt
 create mode 100644 line.c
 create mode 100644 line.h
 create mode 100755 t/t4301-log-line-single-history.sh
 create mode 100755 t/t4302-log-line-merge-history.sh
 create mode 100755 t/t4303-log-line-move-detect.sh
 create mode 100755 t/t4304-log-line-copy-detect.sh
Signature · 1 line
1.7.3.3.807.g6ee1f