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

On Fri, 11 Mar 2016 10:20:42 -0800 Junio C Hamano wrote: JCH> Vadim Zeitlin 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 now I understand why it can't JCH>

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

On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano wrote: JCH> Vadim Zeitlin writes: JCH> JCH> > I.e. the JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even for JCH> > the generated files, as if "--ext-diff" were no

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 linux-m68k.org> writes: > Vadim Zeitlin 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

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

Johannes Sixt 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 i

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

Junio C Hamano pobox.com> writes: > > Vadim Zeitlin 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&q

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

ods using this style. Signed-off-by: Vadim Zeitlin --- 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", "^(

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

Thomas Rast student.ethz.ch> writes: > > Vadim Zeitlin zeitlins.org> writes: > > > Lawrence Mitchell gmx.li> writes: > > > >> Vadim Zeitlin wrote: > >> > >> [...] > >> > >> > git filter-branch --msg-filter svnm

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

Michael Haggerty 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 >

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

Lawrence Mitchell 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

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 availab