Re: [PATCH 2/3 (edit v2)] gitweb: Cache $parent_commit info in git_blame()
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Dec 12, 2008, 17:20 UTC
- Message-ID
- <200812121820.34695.jnareb@gmail.com>
- In-Reply-To
- <7vr64e9jq6.fsf@gitster.siamese.dyndns.org>
On Fri, 12 Dec 2008, Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
Show 8 quoted lines
> > Only commit message has changed. > > Which is a bit unnice, because it will conflict with the original [3/3] > that I queued already (with a pair of fixes, including but not limited to > the one you sent "Oops, it should have been like this" for). > > I can hand wiggle the patch to make it apply, but I'd prefer if I did not > have to do this every time I receive a patch.
I'm sorry about that; I have forgot to change order of patches to have original 1/3, 3/3, 2/3 (I should have used 'stg float' for that).
> I think the conflict was trivial (just a single s/rev/short_rev/) and I > did not make a silly mistake when I fixed it up, but please check the > result on 'pu' after I push the results out.
I did the reordering, and gitweb on compared top of reordered stack of patches with gitweb from top of 'pu' branch, and the only difference in the area touched by git_blame improvements series is one comment I have added in v2 of 3/3.
Thank you for your work.
-- Jakub Narebski Poland