Bug 270222
| Summary: | devel/git - Update to 2.40.0 | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Cy Schubert <cy> | ||||||||||||
| Component: | Individual Port(s) | Assignee: | Cy Schubert <cy> | ||||||||||||
| Status: | Closed FIXED | ||||||||||||||
| Severity: | Affects Only Me | CC: | grahamperrin, yasu | ||||||||||||
| Priority: | --- | Flags: | garga:
maintainer-feedback+
|
||||||||||||
| Version: | Latest | ||||||||||||||
| Hardware: | Any | ||||||||||||||
| OS: | Any | ||||||||||||||
| Attachments: |
|
||||||||||||||
Created attachment 240854 [details]
Complete update
This includes git-html, missed from the previous patch.
So, interestingly, this update has fixed a long-standing problem I've been having with git since spring 2022. At that time I could not rebase Heimdal imports in my Heimdal branches, nor could I rebase unbound -- though rebasing sqlite vendor imports worked. As of this update rebasing vendor imports works again. Created attachment 240863 [details]
restore behaviour priro to 2f26d37a5937
@yuri,
Prior to 2f26d37a5937, binutils served a number of slave ports. The slave ports would not generate shared libraries while the native port did. However after 2f26d37a5937, shared libraries were removed. I think this was a mistake. Please test this patch and please also review the proposed commit log message.
This is the correct patch (and commit log message).
Created attachment 240864 [details]
Adjusted commit log message
Added,
Fixes: 2f26d37a5937 (SVN r517642)
(In reply to Cy Schubert from comment #0) Following two lines should be added to pkg-plist. %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.0.txt I don't know why but `make check-plist` fails to detect orphaned files releated to HTMLDOCS option. (In reply to Cy Schubert from comment #3) Cy, I believe you intended to send this comment to a different bug.. I'll deal with git today. Thanks! (In reply to Yasuhiro Kimura from comment #5) You are right. However, make check-orphans doesn't complain without them. (In reply to Renato Botelho from comment #6) It was meant for this PR. Just a passing comment that this update fixes a significant bug for me. Created attachment 240873 [details]
Added the two release notes files.
Added the two release notes files. Unfortunately, make check-orphans passes even without them. In addition my poudriere and subsequent pkg upgrade did not complain either.
(In reply to Cy Schubert from comment #8) Since it seems to be important for you, go ahead and get it committed. Thanks! @yuri, Prior to 2f26d37a5937, binutils served a number of slave ports. The slave ports would not generate shared libraries while the native port did. However after 2f26d37a5937, shared libraries were removed. I think this was a mistake. Please test this patch and please also review the proposed commit log message. This is the correct patch (and commit log message). A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3a5eb641d287192007f016bed2df0644ebe6184 commit d3a5eb641d287192007f016bed2df0644ebe6184 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2023-03-14 20:55:46 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2023-03-15 17:39:09 +0000 devel/git: Update to 2.4.0 Changelog at https://github.com/git/git/blob/master/Documentation/RelNotes/2.4.0.txt. This update fixes a long-standing problem with git rebase of some (but not all) merges from the vendor branch, resulting in subsequently rebased files being placed into the root of the repo tree. PR: 270222 Submitted by: cy Reported by: cy Approved by: garga devel/git/Makefile | 2 +- devel/git/distinfo | 14 +++++++------- devel/git/pkg-plist | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=97d454cb324d5a1dae16cde52dd2f412ea571c02 commit 97d454cb324d5a1dae16cde52dd2f412ea571c02 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-03-15 18:03:15 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-03-15 18:30:21 +0000 devel/git-cinnabar: unbreak after d3a5eb641d28 patch -p1 -F0 -o helper/object-file.patched.c git-core/object-file.c < helper/object-file.c.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/object-file.c b/object-file.c |index 8be57f48de..52315414f3 100644 |--- a/object-file.c |+++ b/object-file.c -------------------------- Patching file git-core/object-file.c using Plan A... Hunk #1 failed at 34. 1 out of 1 hunks failed--saving rejects to helper/object-file.patched.c.rej done gmake[2]: *** [helper/helper.mk:104: helper/object-file.patched.c] Error 1 PR: 270222 devel/git-cinnabar/Makefile | 2 +- devel/git-cinnabar/files/patch-git-2.40 (new) | 124 ++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) Committed. |
Created attachment 240852 [details] Update git to 2.40.0