From: Thomas Rast <trast@inf.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: [PATCH 0/4] fix log -L -M
Date: Fri, 12 Apr 2013 18:05:08 +0200 [thread overview]
Message-ID: <cover.1365781999.git.trast@inf.ethz.ch> (raw)
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
next prev parent reply other threads:[~2013-04-12 16:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 22:27 What's cooking in git.git (Apr 2013, #02; Fri, 5) Junio C Hamano
2013-04-07 10:38 ` John Keeping
2013-04-12 9:56 ` Thomas Rast
2013-04-12 16:05 ` Thomas Rast [this message]
2013-04-12 16:05 ` [PATCH 1/4] t4211: pass -M to 'git log -M -L...' test Thomas Rast
2013-04-12 16:05 ` [PATCH 2/4] log -L: test merge of parallel modify/rename Thomas Rast
2013-04-12 16:05 ` [PATCH 3/4] log -L: store the path instead of a diff_filespec Thomas Rast
2013-04-12 16:05 ` [PATCH 4/4] log -L: improve comments in process_all_files() Thomas Rast
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1365781999.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.