Opened 17 years ago

Closed 17 years ago

Last modified 15 years ago

#11962 closed update (fixed)

[PATCH] upgrade git to 1.5.1.4

Reported by: zacheryph@… Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: git devel Cc: bryan@…, boeyms@…, zacheryph@…
Port:

Description

Git 1.5.1.4 was released last week but still behind on ports.

This patch does the following:

  • remove no_svn and unneeded variant conflicts rules (tested)
  • update patches to work on new code
  • patch-perl-path removed (change is now in git itself)

Its possible the patch-curl is unneeded but i dont know much of curl or the CURL_MULTI option, so i left it there. I will look at this later today to see what it does and whether it should be changed or not.

This is my first patch for ports , but hopefully not my last :D

Attachments (3)

mp_git1514.patch (3.9 KB) - added by zacheryph@… 17 years ago.
updated patch removing t4200
git-core-1.5.2.patch (3.9 KB) - added by bryan@… 17 years ago.
patch-11962-7333 (4.0 KB) - added by bryan@… 17 years ago.
patch, including the fix for ticket #7333

Download all attachments as: .zip

Change History (10)

comment:1 Changed 17 years ago by bryan@…

It looks like patch-t4200 has also been applied upstream in a form slightly different than the patch I originally submitted, so it can be dropped as well. patch-perl-path encountered objections, but we prevailed. :)

I'd hesitate before removing the CURL workaround. To see the problem, try several HTTP clones against a large repository without the workaround and git built against curl 7.16.0. 7.16.1 definitely worked better than 7.16.0, but still occasionally broke. PowerPC broke more often than Intel. 7.16.2 may or may not have the bug fixed.

Changed 17 years ago by zacheryph@…

Attachment: mp_git1514.patch added

updated patch removing t4200

comment:2 Changed 17 years ago by zacheryph@…

patch updated with removal of t4200 patch. if there are any other problems please let me know.

comment:3 Changed 17 years ago by zacheryph@…

Ticket #12008 nullifies this patch. Please close this and look at that one instead.

comment:4 Changed 17 years ago by bryan@…

I've updated the patch for 1.5.2 and removed a couple of dependencies that are no longer needed.

The doc variant currently doesn't work. It seems to be very similar to bug #7333.

Changed 17 years ago by bryan@…

Attachment: git-core-1.5.2.patch added

Changed 17 years ago by bryan@…

Attachment: patch-11962-7333 added

patch, including the fix for ticket #7333

comment:5 Changed 17 years ago by boeyms@…

Cc: boeyms@… zacheryph@… added
Resolution: fixed
Status: newclosed

patch-11962-7333 committed in r25898. Thanks!

comment:6 Changed 15 years ago by jmroot (Joshua Root)

Type: enhancementupdate

comment:7 Changed 15 years ago by (none)

Milestone: Port Updates

Milestone Port Updates deleted

Note: See TracTickets for help on using tickets.