FreeBSD Bugzilla – Attachment 204934 Details for
Bug 238442
devel/git: update to 2.22.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v0 (has commit message)
bug238442.diff (text/plain), 9.23 KB, created by
Jan Beich
on 2019-06-10 02:55:38 UTC
(
hide
)
Description:
v0 (has commit message)
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2019-06-10 02:55:38 UTC
Size:
9.23 KB
patch
obsolete
>From 660aea4d1c02694fa5a56a286e4204c03512fa60 Mon Sep 17 00:00:00 2001 >From: Jan Beich <jbeich@FreeBSD.org> >Date: Mon, 10 Jun 2019 01:16:00 +0000 >Subject: [PATCH] devel/git: update to 2.22.0 > >Changes: https://lkml.org/lkml/2019/6/7/1177 >Changes: https://github.blog/2019-06-07-highlights-from-git-2-22/ >PR: 238442 >Approved by: garga (maintainer) >--- > devel/git-cinnabar/Makefile | 1 + > devel/git-cinnabar/files/patch-git-2.22 | 94 +++++++++++++++++++++++++ > devel/git/Makefile | 2 +- > devel/git/distinfo | 14 ++-- > devel/git/pkg-plist | 11 ++- > 5 files changed, 107 insertions(+), 15 deletions(-) > create mode 100644 devel/git-cinnabar/files/patch-git-2.22 > >diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile >index c63820623b43..8ce6564439ac 100644 >--- a/devel/git-cinnabar/Makefile >+++ b/devel/git-cinnabar/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= git-cinnabar > DISTVERSION= 0.5.1 >+PORTREVISION= 1 > CATEGORIES= devel > > MAINTAINER= jbeich@FreeBSD.org >diff --git a/devel/git-cinnabar/files/patch-git-2.22 b/devel/git-cinnabar/files/patch-git-2.22 >new file mode 100644 >index 000000000000..8efd583803f9 >--- /dev/null >+++ b/devel/git-cinnabar/files/patch-git-2.22 >@@ -0,0 +1,94 @@ >+https://github.com/glandium/git-cinnabar/commit/b35af295e18a >+ >+--- CI/tools.py.orig 2019-05-08 21:36:37 UTC >++++ CI/tools.py >+@@ -12,7 +12,7 @@ import msys >+ >+ >+ MERCURIAL_VERSION = '5.0' >+-GIT_VERSION = '2.21.0' >++GIT_VERSION = '2.22.0' >+ >+ ALL_MERCURIAL_VERSIONS = ( >+ '1.9.3', '2.0.2', '2.1.2', '2.2.3', '2.3.2', '2.4.2', '2.5.4', >+--- helper/GIT-VERSION.mk.orig 2019-05-08 21:36:37 UTC >++++ helper/GIT-VERSION.mk >+@@ -1,2 +1,2 @@ >+-GIT_VERSION ?= v2.21.0 >++GIT_VERSION ?= v2.22.0 >+ WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 >+--- helper/cinnabar-fast-import.c.orig 2019-05-08 21:36:37 UTC >++++ helper/cinnabar-fast-import.c >+@@ -245,7 +245,7 @@ static uintmax_t parse_mark_ref(const char *p, char ** >+ if (**endptr == ':') { >+ char *path_end = strpbrk(++(*endptr), " \n"); >+ if (path_end) { >+- unsigned mode; >++ unsigned short mode; >+ char *path = xstrndup(*endptr, path_end - *endptr); >+ if (!get_tree_entry(note, path, &git_oid, &mode)) >+ note = &git_oid; >+--- helper/notes.c.patch.orig 2019-05-08 21:36:37 UTC >++++ helper/notes.c.patch >+@@ -1,10 +1,10 @@ >+ diff --git a/notes.c b/notes.c >+-index 7f7cc4d511..1c127dcbe0 100644 >++index 532ec37865..b1ffc4975e 100644 >+ --- a/notes.c >+ +++ b/notes.c >+-@@ -413,11 +413,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, >++@@ -415,11 +415,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, >+ >+- if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) { >++ if (path_len == 2 * (hashsz - prefix_len)) { >+ /* This is potentially the remainder of the SHA-1 */ >+ - >+ - if (!S_ISREG(entry.mode)) >+@@ -12,9 +12,9 @@ index 7f7cc4d511..1c127dcbe0 100644 >+ - goto handle_non_note; >+ - >+ if (hex_to_bytes(object_oid.hash + prefix_len, entry.path, >+- GIT_SHA1_RAWSZ - prefix_len)) >++ hashsz - prefix_len)) >+ goto handle_non_note; /* entry.path is not a SHA1 */ >+-@@ -720,6 +715,7 @@ static int write_each_note_helper(struct tree_write_stack *tws, >++@@ -722,6 +717,7 @@ static int write_each_note_helper(struct tree_write_stack *tws, >+ struct write_each_note_data { >+ struct tree_write_stack *root; >+ struct non_note *next_non_note; >+@@ -22,7 +22,7 @@ index 7f7cc4d511..1c127dcbe0 100644 >+ }; >+ >+ static int write_each_non_note_until(const char *note_path, >+-@@ -749,7 +745,7 @@ static int write_each_note(const struct object_id *object_oid, >++@@ -751,7 +747,7 @@ static int write_each_note(const struct object_id *object_oid, >+ struct write_each_note_data *d = >+ (struct write_each_note_data *) cb_data; >+ size_t note_path_len = strlen(note_path); >+@@ -31,7 +31,7 @@ index 7f7cc4d511..1c127dcbe0 100644 >+ >+ if (note_path[note_path_len - 1] == '/') { >+ /* subtree entry */ >+-@@ -1124,7 +1120,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn, >++@@ -1126,7 +1122,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn, >+ return for_each_note_helper(t, t->root, 0, 0, flags, fn, cb_data); >+ } >+ >+@@ -41,7 +41,7 @@ index 7f7cc4d511..1c127dcbe0 100644 >+ { >+ struct tree_write_stack root; >+ struct write_each_note_data cb_data; >+-@@ -1141,6 +1138,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) >++@@ -1143,6 +1140,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) >+ root.path[0] = root.path[1] = '\0'; >+ cb_data.root = &root; >+ cb_data.next_non_note = t->first_non_note; >+@@ -49,7 +49,7 @@ index 7f7cc4d511..1c127dcbe0 100644 >+ >+ /* Write tree objects representing current notes tree */ >+ flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES | >+-@@ -1153,6 +1151,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) >++@@ -1155,6 +1153,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) >+ return ret; >+ } >+ >diff --git a/devel/git/Makefile b/devel/git/Makefile >index 6d60b7a1053a..f4263117e5ae 100644 >--- a/devel/git/Makefile >+++ b/devel/git/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= git >-DISTVERSION= 2.21.0 >+DISTVERSION= 2.22.0 > CATEGORIES= devel > MASTER_SITES= KERNEL_ORG/software/scm/git > DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ >diff --git a/devel/git/distinfo b/devel/git/distinfo >index 6f3080b14efb..a7492d057684 100644 >--- a/devel/git/distinfo >+++ b/devel/git/distinfo >@@ -1,7 +1,7 @@ >-TIMESTAMP = 1551062552 >-SHA256 (git-2.21.0.tar.xz) = 8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28 >-SIZE (git-2.21.0.tar.xz) = 5491296 >-SHA256 (git-manpages-2.21.0.tar.xz) = 2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51 >-SIZE (git-manpages-2.21.0.tar.xz) = 440096 >-SHA256 (git-htmldocs-2.21.0.tar.xz) = b1758e9903b21bad5cb5694617df22b2aa23c093541fb282bf11862df4962ca1 >-SIZE (git-htmldocs-2.21.0.tar.xz) = 1234956 >+TIMESTAMP = 1559932652 >+SHA256 (git-2.22.0.tar.xz) = 159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f >+SIZE (git-2.22.0.tar.xz) = 5609772 >+SHA256 (git-manpages-2.22.0.tar.xz) = 4e2cfda33d8e86812bfcdb907478d1144412ce472c32edd0219b3c0201c7ee3a >+SIZE (git-manpages-2.22.0.tar.xz) = 443320 >+SHA256 (git-htmldocs-2.22.0.tar.xz) = 5c7e010abfca5ff2eabf3616bf7216609cfb93dbc12b7c4e13f4ae3e539dbc79 >+SIZE (git-htmldocs-2.22.0.tar.xz) = 1262136 >diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist >index 6d9265255b28..1043f603b310 100644 >--- a/devel/git/pkg-plist >+++ b/devel/git/pkg-plist >@@ -98,7 +98,7 @@ libexec/git-core/git-init > libexec/git-core/git-init-db > libexec/git-core/git-instaweb > libexec/git-core/git-interpret-trailers >-libexec/git-core/git-legacy-rebase >+libexec/git-core/git-legacy-stash > libexec/git-core/git-log > libexec/git-core/git-ls-files > libexec/git-core/git-ls-remote >@@ -140,7 +140,6 @@ libexec/git-core/git-read-tree > libexec/git-core/git-rebase > libexec/git-core/git-rebase--am > libexec/git-core/git-rebase--common >-libexec/git-core/git-rebase--interactive > libexec/git-core/git-rebase--preserve-merges > libexec/git-core/git-receive-pack > libexec/git-core/git-reflog >@@ -163,7 +162,6 @@ libexec/git-core/git-revert > libexec/git-core/git-rm > %%SEND_EMAIL%%libexec/git-core/git-send-email > libexec/git-core/git-send-pack >-libexec/git-core/git-serve > libexec/git-core/git-sh-i18n > libexec/git-core/git-sh-i18n--envsubst > libexec/git-core/git-sh-setup >@@ -217,6 +215,7 @@ libexec/git-core/mergetools/kompare > libexec/git-core/mergetools/meld > libexec/git-core/mergetools/opendiff > libexec/git-core/mergetools/p4merge >+libexec/git-core/mergetools/smerge > libexec/git-core/mergetools/tkdiff > libexec/git-core/mergetools/tortoisemerge > libexec/git-core/mergetools/vimdiff >@@ -329,7 +328,6 @@ man/man1/git-receive-pack.1.gz > man/man1/git-reflog.1.gz > man/man1/git-remote-ext.1.gz > man/man1/git-remote-fd.1.gz >-man/man1/git-remote-testgit.1.gz > man/man1/git-remote.1.gz > man/man1/git-repack.1.gz > man/man1/git-replace.1.gz >@@ -377,7 +375,6 @@ man/man1/git-worktree.1.gz > man/man1/git-write-tree.1.gz > man/man1/git.1.gz > %%GUI%%man/man1/gitk.1.gz >-man/man1/gitremote-helpers.1.gz > man/man1/gitweb.1.gz > man/man5/gitattributes.5.gz > man/man5/githooks.5.gz >@@ -393,6 +390,7 @@ man/man7/gitdiffcore.7.gz > man/man7/giteveryday.7.gz > man/man7/gitglossary.7.gz > man/man7/gitnamespaces.7.gz >+man/man7/gitremote-helpers.7.gz > man/man7/gitrevisions.7.gz > man/man7/gitsubmodules.7.gz > man/man7/gittutorial-2.7.gz >@@ -974,8 +972,6 @@ man/man7/gitworkflows.7.gz > %%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html > %%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.txt > %%HTMLDOCS%%%%DOCSDIR%%/git-remote-helpers.html >-%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.html >-%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.txt > %%HTMLDOCS%%%%DOCSDIR%%/git-remote.html > %%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt > %%HTMLDOCS%%%%DOCSDIR%%/git-repack.html >@@ -1271,6 +1267,7 @@ share/emacs/site-lisp/git/git.el > %%CONTRIB%%share/git-core/contrib/coccinelle/README > %%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci > %%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci >+%%CONTRIB%%share/git-core/contrib/coccinelle/flex_alloc.cocci > %%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci > %%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci > %%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
jbeich
:
maintainer-approval?
(
garga
)
Actions:
View
|
Diff
Attachments on
bug 238442
: 204934