Re: [PATCH] gitweb: Fix and simplify "split patch" detection

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 3, 2007, 00:15 UTC
Message-ID: <7vmyw4ob7z.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200709022218.43042.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

Show 5 quoted lines

> Alternate solution, which we did chose, is to check when git splits
> patches, and do not check if parsed info from current patch corresponds
> to current or next raw diff format output line.  Git splits patches
> only for 'T' (typechange) status filepair, and there always two patches
> corresponding to one raw diff line.

Not that I can think of a better way offhand than what you already mentioned, but I have to say that I am not entirely happy with this implementation. A really old git showed two patches (one creation and one deletion) for "complete rewrite", which was corrected long time ago. I do not think we will change the typechange output in a similar way in the future, but relying on that level of detail feels somewhat ugly.

As you are reading from --patch-with-raw, you already know the order of patches that will be given to you when you finished reading the "raw" part. The patches will come in the same order. So it might be possible to keep track of patches to what path you are expecting and decide if it is part of what you are processing at the point you process "diff --git" line.