Opened 7 years ago

Closed 7 years ago

Last modified 7 years ago

#15468 closed defect (fixed)

update to latest upstream git

Reported by: vbraun Owned by:
Priority: major Milestone: sage-6.0
Component: packages: standard Keywords:
Cc: schilly Merged in:
Authors: Volker Braun Reviewers: R. Andrew Ohana
Report Upstream: N/A Work issues:
Branch: u/vbraun/git_1_8_4_4 (Commits, GitHub, GitLab) Commit: f6fcc98dffa65e6e9ce165aff1fa6929325278bb
Dependencies: #14482 Stopgaps:

Status badges

Description (last modified by vbraun)

The git self-tests fail on OSX 10.8, 10.9 because of braindamage in Apple's regex library. This is worked around in upstream git, so just update to the latest and greatest:

*** ***
ok 1 - character classes (isspace, isalpha etc.)
ok 2 - mktemp to nonexistent directory prints filename
ok 3 - mktemp to unwritable directory prints filename
not ok - 4 check for a bug in the regex routines
#		# if this test fails, re-build git with NO_REGEX=1
#		test-regex
# failed 1 among 4 test(s)
make[5]: *** [] Error 1
make[4]: *** [test] Error 2
make[3]: *** [test] Error 2
Error running git's combined build/test suite.

Upstream tarball:

Change History (12)

comment:1 Changed 7 years ago by vbraun

  • Description modified (diff)

comment:2 Changed 7 years ago by vbraun

  • Description modified (diff)

comment:3 Changed 7 years ago by vbraun

  • Branch set to u/vbraun/git_1_8_4_4

comment:4 Changed 7 years ago by vbraun

  • Commit set to f3df29449a252f80e1f4d08e26a837bf1846d7f4
  • Status changed from new to needs_review

New commits:

f3df294update git to latest upstream version

comment:5 Changed 7 years ago by vbraun

  • Dependencies set to #14482

The update breaks some sage-dev doctests. Fixing...

comment:6 Changed 7 years ago by git

  • Commit changed from f3df29449a252f80e1f4d08e26a837bf1846d7f4 to f6fcc98dffa65e6e9ce165aff1fa6929325278bb

Branch pushed to git repo; I updated commit sha1. New commits:

f6fcc98fixing git interface doctests for new git version
4dd4da5Merge dev scripts branch since their doctests are changed by the new git
946b5b4fix the commandline sage -dev script
2941308Use a DoctestSageDevWrapper? for the global dev object during doctests
6a512d6Explicitly specify the key type in ssh-keygen (requried for Sun SSH)
702d7afdo not suggest force push

comment:7 Changed 7 years ago by ohanar

  • Reviewers set to R. Andrew Ohana
  • Status changed from needs_review to positive_review

Other than being slightly dated (1.8.5 came out a few days ago), this seems fine.

comment:8 Changed 7 years ago by ohanar

  • Milestone changed from sage-5.13 to sage-6.0

comment:9 Changed 7 years ago by vbraun

  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:10 Changed 7 years ago by vbraun

  • Cc schilly added

Harald: please mirror tarball...

comment:11 Changed 7 years ago by schilly

I'm not sure where to put this: the packages in "standard" are updated for every new release. There are also git packages in "optional" and "experimental" and the new "upstream/git".

I think we can get rid of the ones in optional and experimental and you mean to replace the one in upstream/git ?

comment:12 Changed 7 years ago by vbraun

This ticket is not a spkg, just a new-style tarball. Should go into upstream. We should probably keep the old git spkg in "standard" for a while if Sage 5 users need it.

Note: See TracTickets for help on using tickets.