Junio C Hamano wrote: > > 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 [...] > 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 -- 1.7.3.3.807.g6ee1f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html