Re: [PATCH v3 3/3] gitweb: Optional grouping of projects by category

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



At Fri, 5 Dec 2008 11:45:08 +0100, Jakub Narebski wrote:

> > > Nice... but perhaps it would be better to simply pass $from / $to to
> > > build_projlist_by_category function, and have in %categories only
> > > projects which are shown...
> > 
> > Ah you're right, we could do that, I hadn't thought of it.  Sounds
> > cleaner than the $from/$to dance I did in this patch.
>
> [...] we can simply pass $from and $to to
> build_projlist_by_category(), and use loop $from..$to there.

I just tried, it works but we first need to sort @projects by
category.

> Somehow I couldn't apply second patch in series:
> 
>  $ git am -3 -u "[PATCH v3 2_3] gitweb: Split git_project_list_body in two functions.txt"
>  Applying: gitweb: Split git_project_list_body in two functions
>  error: patch failed: gitweb/gitweb.perl:3972
>  error: gitweb/gitweb.perl: patch does not apply
>  fatal: sha1 information is lacking or useless (gitweb/gitweb.perl).
>  Repository lacks necessary blobs to fall back on 3-way merge.
>  Cannot fall back to three-way merge.
>  Patch failed at 0001.

Where does it find the reference to the "necessary blobs"?  Could it
be because I didn't leave the From OBJECTID DATE line in my email
header?

Seems like there was a recent change on the line

  my $check_forks = gitweb_check_feature('forks');

so I had to update my patch to apply cleanly on the current master
HEAD.

I'm gonna re-send the three patches as a new version.

-- 
Sébastien Cevey / inso.cc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux