threads / patch / 9965

patch, 5 partsgitweb: Fixes and improvements related to diffs

Subject: [PATCH 0/5] gitweb: Fixes and improvements related to diffs

## tl;dr

3 messages between Sep 21, 2007 and Sep 25, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Jakub Narebski· Sep 21, 2007, 21:31 UTC · lore

This series of patches adds fixes, simplifications and improvements related to diff handling in gitweb ('commit', 'commitdiff' views).

Becaus I didn't have access to Internet, this series is based on 1e61b7640d09015213dbcae3564fa27ac6a8c151 (v1.5.3.1-1-g1e61b76). As I am sending it via GMail WWW interface, patches are send as attachements.

I send this series now, even without good Internet access, because it contains two bugfixes, and one code fix. I'll try to resend it rebase on top of current master later...

Shortlog:
=========
Jakub Narebski (5):
      gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
      gitweb: No difftree output for trivial merge
      gitweb: Fix and simplify "split patch" detection
      gitweb: Always set 'from_file' and 'to_file' in parse_difftree_raw_line
      gitweb: Add 'status_str' to parse_difftree_raw_line output

Diffstat:
=========
 gitweb/gitweb.perl |  208 ++++++++++++++++++++--------------------------------
 1 files changed, 80 insertions(+), 128 deletions(-)

-- 
Jakub Narebski
Poland

Junio C Hamano· Sep 25, 2007, 22:16 UTC · re: Jakub Narebski · lore

Re: [PATCH 0/5] gitweb: Fixes and improvements related to diffs

"Jakub Narebski" <jnareb@gmail.com> writes:

Show 11 quoted lines

> This series of patches adds fixes, simplifications and improvements
> related to diff handling in gitweb ('commit', 'commitdiff' views).
>
> Becaus I didn't have access to Internet, this series is based
> on 1e61b7640d09015213dbcae3564fa27ac6a8c151 (v1.5.3.1-1-g1e61b76).
> As I am sending it via GMail WWW interface, patches are send as
> attachements.
>
> I send this series now, even without good Internet access,
> because it contains two bugfixes, and one code fix. I'll try to
> resend it rebase on top of current master later...

I've parked the first two in 'master' and was hoping to roll them into 'maint'. I haven't taken a look at the other three as I was waiting for a resend. If you think some of them are bugfix material for 'maint', please mark them as such.

Thanks.

Jakub Narebski· Sep 25, 2007, 22:21 UTC · re: Junio C Hamano · lore

Re: [PATCH 0/5] gitweb: Fixes and improvements related to diffs

On 9/26/07, Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> "Jakub Narebski" <jnareb@gmail.com> writes:
>
> > This series of patches adds fixes, simplifications and improvements
> > related to diff handling in gitweb ('commit', 'commitdiff' views).
> >
> > Becaus I didn't have access to Internet, this series is based
> > on 1e61b7640d09015213dbcae3564fa27ac6a8c151 (v1.5.3.1-1-g1e61b76).
> > As I am sending it via GMail WWW interface, patches are send as
> > attachements.
> >
> > I send this series now, even without good Internet access,
> > because it contains two bugfixes, and one code fix. I'll try to
> > resend it rebase on top of current master later...
>
> I've parked the first two in 'master' and was hoping to roll
> them into 'maint'.  I haven't taken a look at the other three as
> I was waiting for a resend.  If you think some of them are
> bugfix material for 'maint', please mark them as such.

Third fixes a rare bug when gitweb screwed up names of files in the patchset part of commitdiff view. This took place only (diagnosed by pasky) when there were different files which had the same preimage and the same postimage.

-- 
Jakub Narebski