Re[2]: Possible bug: --ext-diff ignored with --cc in git log

On Fri, 11 Mar 2016 10:20:42 -0800 Junio C Hamano <gits...@pobox.com> wrote: JCH> Vadim Zeitlin <vz-...@zeitlins.org> writes: JCH> JCH> > Thank you for your reply, Junio, I hadn't realized that --cc was dependent JCH> > on textual diff output format before, but

Re[2]: Possible bug: --ext-diff ignored with --cc in git log

On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano <gits...@pobox.com> wrote: JCH> Vadim Zeitlin <vz-...@zeitlins.org> writes: JCH> JCH> > I.e. the JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even for JCH> > the gene

Possible bug: --ext-diff ignored with --cc in git log

Hello, I use a combination of git attributes and a custom diff driver to ignore the changes to the generated files (that we unfortunately need to keep in our repository) from appearing in "git diff" and "git log" output, i.e.: % cat .gitattributes # Use a custom diff driver for

Re: [PATCH] Avoid false positives in label detection in cpp diff hunk header regex.

Andreas Schwab schwab at linux-m68k.org writes: Vadim Zeitlin vz-git at zeitlins.org writes: !^[ \t]*[A-Za-z_][A-Za-z_0-9]+[ \t]*:([^:]|$)\n That would fail to match single-character identifiers. Oops, yes, you're right, of course, sorry. I have no idea why did I write that we needed

[PATCH] Avoid false positives in label detection in cpp diff hunk header regex.

. Signed-off-by: Vadim Zeitlin vz-...@zeitlins.org --- userdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index ea43a03..9415586 100644 --- a/userdiff.c +++ b/userdiff.c @@ -125,7 +125,7 @@ PATTERNS(tex, ^(((sub)*section|chapter|part)\\*{0,1

Re: [PATCH] Avoid false positives in label detection in cpp diff hunk header regex.

Junio C Hamano gitster at pobox.com writes: Vadim Zeitlin vz-git at zeitlins.org writes: ... diff --git a/userdiff.c b/userdiff.c index ea43a03..9415586 100644 --- a/userdiff.c +++ b/userdiff.c @@ -125,7 +125,7 @@ PATTERNS(tex, ^(((sub)*section|chapter|part)\\*{0,1

Re: [PATCH] Avoid false positives in label detection in cpp diff hunk header regex.

Johannes Sixt j6t at kdbg.org writes: I also wonder if label : should also be caught, or is it too weird format to be worth supporting? It's easy to support, by inserting another [ \t] before the first colon. So, why not? This is really nitpicking, but if we do it, then

Rewriting references to existing commits in commit messages with filter-branch

Hello, I'm in the process of converting an existing svn repository to git. The first step was a standard git svn clone that went successfully (after taking 15 hours to complete). However I don't want to stop there and would like massage the repository a little before making it publicly

Re: Rewriting references to existing commits in commit messages with filter-branch

Lawrence Mitchell wence at gmx.li writes: Vadim Zeitlin wrote: [...] git filter-branch --msg-filter svnmsg2git --tag-name-filter cat -- --all git rev-list lists by default in chronological order. Do you want to pass --topo-order as one of the rev-list options? Thanks, this looked

Re: Rewriting references to existing commits in commit messages with filter-branch

Michael Haggerty mhagger at alum.mit.edu writes: On 03/11/2013 12:45 PM, Vadim Zeitlin wrote: [...] The first thing I'd like to do is to replace all references to subversion revision numbers in the commit messages with the corresponding git commit SHA1s. [...] I have a couple

Re: Rewriting references to existing commits in commit messages with filter-branch

Thomas Rast trast at student.ethz.ch writes: Vadim Zeitlin vz-git at zeitlins.org writes: Lawrence Mitchell wence at gmx.li writes: Vadim Zeitlin wrote: [...] git filter-branch --msg-filter svnmsg2git --tag-name-filter cat -- --all git rev-list lists by default