Attachment #204934 for bug #238442

View | Details | Raw Unified | Return to bug 238442
Collapse All | Expand All

Lines 2-7 Link Here

(-)b/devel/git-cinnabar/Makefile (+1 lines)
2		2
3	PORTNAME= git-cinnabar	3	PORTNAME= git-cinnabar
4	DISTVERSION= 0.5.1	4	DISTVERSION= 0.5.1
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= jbeich@FreeBSD.org	8	MAINTAINER= jbeich@FreeBSD.org




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;
  }
  

Lines 2-8 Link Here

(-)b/devel/git/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= git	4	PORTNAME= git
5	DISTVERSION= 2.21.0	5	DISTVERSION= 2.22.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= KERNEL_ORG/software/scm/git	7	MASTER_SITES= KERNEL_ORG/software/scm/git
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \

Lines 1-7 Link Here

(-)b/devel/git/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1551062552	1	TIMESTAMP = 1559932652
2	SHA256 (git-2.21.0.tar.xz) = 8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28	2	SHA256 (git-2.22.0.tar.xz) = 159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f
3	SIZE (git-2.21.0.tar.xz) = 5491296	3	SIZE (git-2.22.0.tar.xz) = 5609772
4	SHA256 (git-manpages-2.21.0.tar.xz) = 2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51	4	SHA256 (git-manpages-2.22.0.tar.xz) = 4e2cfda33d8e86812bfcdb907478d1144412ce472c32edd0219b3c0201c7ee3a
5	SIZE (git-manpages-2.21.0.tar.xz) = 440096	5	SIZE (git-manpages-2.22.0.tar.xz) = 443320
6	SHA256 (git-htmldocs-2.21.0.tar.xz) = b1758e9903b21bad5cb5694617df22b2aa23c093541fb282bf11862df4962ca1	6	SHA256 (git-htmldocs-2.22.0.tar.xz) = 5c7e010abfca5ff2eabf3616bf7216609cfb93dbc12b7c4e13f4ae3e539dbc79
7	SIZE (git-htmldocs-2.21.0.tar.xz) = 1234956	7	SIZE (git-htmldocs-2.22.0.tar.xz) = 1262136




libexec/git-core/git-init-db
libexec/git-core/git-instaweb
libexec/git-core/git-interpret-trailers
libexec/git-core/git-legacy-stash
libexec/git-core/git-log
libexec/git-core/git-ls-files
libexec/git-core/git-ls-remote

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

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

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

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

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

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

%%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

%%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

Return to bug 238442

Added Link Here

(-)b/devel/git-cinnabar/files/patch-git-2.22 (+94 lines)
1	https://github.com/glandium/git-cinnabar/commit/b35af295e18a
2
3	--- CI/tools.py.orig 2019-05-08 21:36:37 UTC
4	+++ CI/tools.py
5	@@ -12,7 +12,7 @@ import msys
6
7
8	MERCURIAL_VERSION = '5.0'
9	-GIT_VERSION = '2.21.0'
10	+GIT_VERSION = '2.22.0'
11
12	ALL_MERCURIAL_VERSIONS = (
13	'1.9.3', '2.0.2', '2.1.2', '2.2.3', '2.3.2', '2.4.2', '2.5.4',
14	--- helper/GIT-VERSION.mk.orig 2019-05-08 21:36:37 UTC
15	+++ helper/GIT-VERSION.mk
16	@@ -1,2 +1,2 @@
17	-GIT_VERSION ?= v2.21.0
18	+GIT_VERSION ?= v2.22.0
19	WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1
20	--- helper/cinnabar-fast-import.c.orig 2019-05-08 21:36:37 UTC
21	+++ helper/cinnabar-fast-import.c
22	@@ -245,7 +245,7 @@ static uintmax_t parse_mark_ref(const char p, char *
23	if (**endptr == ':') {
24	char path_end = strpbrk(++(endptr), " \n");
25	if (path_end) {
26	- unsigned mode;
27	+ unsigned short mode;
28	char path = xstrndup(endptr, path_end - *endptr);
29	if (!get_tree_entry(note, path, &git_oid, &mode))
30	note = &git_oid;
31	--- helper/notes.c.patch.orig 2019-05-08 21:36:37 UTC
32	+++ helper/notes.c.patch
33	@@ -1,10 +1,10 @@
34	diff --git a/notes.c b/notes.c
35	-index 7f7cc4d511..1c127dcbe0 100644
36	+index 532ec37865..b1ffc4975e 100644
37	--- a/notes.c
38	+++ b/notes.c
39	-@@ -413,11 +413,6 @@ static void load_subtree(struct notes_tree t, struct leaf_node subtree,
40	+@@ -415,11 +415,6 @@ static void load_subtree(struct notes_tree t, struct leaf_node subtree,
41
42	- if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) {
43	+ if (path_len == 2 * (hashsz - prefix_len)) {
44	/* This is potentially the remainder of the SHA-1 */
45	-
46	- if (!S_ISREG(entry.mode))
47	@@ -12,9 +12,9 @@ index 7f7cc4d511..1c127dcbe0 100644
48	- goto handle_non_note;
49	-
50	if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
51	- GIT_SHA1_RAWSZ - prefix_len))
52	+ hashsz - prefix_len))
53	goto handle_non_note; /* entry.path is not a SHA1 */
54	-@@ -720,6 +715,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
55	+@@ -722,6 +717,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
56	struct write_each_note_data {
57	struct tree_write_stack *root;
58	struct non_note *next_non_note;
59	@@ -22,7 +22,7 @@ index 7f7cc4d511..1c127dcbe0 100644
60	};
61
62	static int write_each_non_note_until(const char *note_path,
63	-@@ -749,7 +745,7 @@ static int write_each_note(const struct object_id *object_oid,
64	+@@ -751,7 +747,7 @@ static int write_each_note(const struct object_id *object_oid,
65	struct write_each_note_data *d =
66	(struct write_each_note_data *) cb_data;
67	size_t note_path_len = strlen(note_path);
68	@@ -31,7 +31,7 @@ index 7f7cc4d511..1c127dcbe0 100644
69
70	if (note_path[note_path_len - 1] == '/') {
71	/* subtree entry */
72	-@@ -1124,7 +1120,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
73	+@@ -1126,7 +1122,8 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
74	return for_each_note_helper(t, t->root, 0, 0, flags, fn, cb_data);
75	}
76
77	@@ -41,7 +41,7 @@ index 7f7cc4d511..1c127dcbe0 100644
78	{
79	struct tree_write_stack root;
80	struct write_each_note_data cb_data;
81	-@@ -1141,6 +1138,7 @@ int write_notes_tree(struct notes_tree t, struct object_id result)
82	+@@ -1143,6 +1140,7 @@ int write_notes_tree(struct notes_tree t, struct object_id result)
83	root.path[0] = root.path[1] = '\0';
84	cb_data.root = &root;
85	cb_data.next_non_note = t->first_non_note;
86	@@ -49,7 +49,7 @@ index 7f7cc4d511..1c127dcbe0 100644
87
88	/* Write tree objects representing current notes tree */
89	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES \|
90	-@@ -1153,6 +1151,11 @@ int write_notes_tree(struct notes_tree t, struct object_id result)
91	+@@ -1155,6 +1153,11 @@ int write_notes_tree(struct notes_tree t, struct object_id result)
92	return ret;
93	}
94

Lines 98-104 libexec/git-core/git-init Link Here

(-)b/devel/git/pkg-plist (-7 / +4 lines)
98	libexec/git-core/git-init-db	98	libexec/git-core/git-init-db
99	libexec/git-core/git-instaweb	99	libexec/git-core/git-instaweb
100	libexec/git-core/git-interpret-trailers	100	libexec/git-core/git-interpret-trailers
101	libexec/git-core/git-legacy-rebase	101	libexec/git-core/git-legacy-stash
102	libexec/git-core/git-log	102	libexec/git-core/git-log
103	libexec/git-core/git-ls-files	103	libexec/git-core/git-ls-files
104	libexec/git-core/git-ls-remote	104	libexec/git-core/git-ls-remote
Lines 140-146 libexec/git-core/git-read-tree Link Here
140	libexec/git-core/git-rebase	140	libexec/git-core/git-rebase
141	libexec/git-core/git-rebase--am	141	libexec/git-core/git-rebase--am
142	libexec/git-core/git-rebase--common	142	libexec/git-core/git-rebase--common
143	libexec/git-core/git-rebase--interactive
144	libexec/git-core/git-rebase--preserve-merges	143	libexec/git-core/git-rebase--preserve-merges
145	libexec/git-core/git-receive-pack	144	libexec/git-core/git-receive-pack
146	libexec/git-core/git-reflog	145	libexec/git-core/git-reflog
Lines 163-169 libexec/git-core/git-revert Link Here
163	libexec/git-core/git-rm	162	libexec/git-core/git-rm
164	%%SEND_EMAIL%%libexec/git-core/git-send-email	163	%%SEND_EMAIL%%libexec/git-core/git-send-email
165	libexec/git-core/git-send-pack	164	libexec/git-core/git-send-pack
166	libexec/git-core/git-serve
167	libexec/git-core/git-sh-i18n	165	libexec/git-core/git-sh-i18n
168	libexec/git-core/git-sh-i18n--envsubst	166	libexec/git-core/git-sh-i18n--envsubst
169	libexec/git-core/git-sh-setup	167	libexec/git-core/git-sh-setup
Lines 217-222 libexec/git-core/mergetools/kompare Link Here
217	libexec/git-core/mergetools/meld	215	libexec/git-core/mergetools/meld
218	libexec/git-core/mergetools/opendiff	216	libexec/git-core/mergetools/opendiff
219	libexec/git-core/mergetools/p4merge	217	libexec/git-core/mergetools/p4merge
		218	libexec/git-core/mergetools/smerge
220	libexec/git-core/mergetools/tkdiff	219	libexec/git-core/mergetools/tkdiff
221	libexec/git-core/mergetools/tortoisemerge	220	libexec/git-core/mergetools/tortoisemerge
222	libexec/git-core/mergetools/vimdiff	221	libexec/git-core/mergetools/vimdiff
Lines 329-335 man/man1/git-receive-pack.1.gz Link Here
329	man/man1/git-reflog.1.gz	328	man/man1/git-reflog.1.gz
330	man/man1/git-remote-ext.1.gz	329	man/man1/git-remote-ext.1.gz
331	man/man1/git-remote-fd.1.gz	330	man/man1/git-remote-fd.1.gz
332	man/man1/git-remote-testgit.1.gz
333	man/man1/git-remote.1.gz	331	man/man1/git-remote.1.gz
334	man/man1/git-repack.1.gz	332	man/man1/git-repack.1.gz
335	man/man1/git-replace.1.gz	333	man/man1/git-replace.1.gz
Lines 377-383 man/man1/git-worktree.1.gz Link Here
377	man/man1/git-write-tree.1.gz	375	man/man1/git-write-tree.1.gz
378	man/man1/git.1.gz	376	man/man1/git.1.gz
379	%%GUI%%man/man1/gitk.1.gz	377	%%GUI%%man/man1/gitk.1.gz
380	man/man1/gitremote-helpers.1.gz
381	man/man1/gitweb.1.gz	378	man/man1/gitweb.1.gz
382	man/man5/gitattributes.5.gz	379	man/man5/gitattributes.5.gz
383	man/man5/githooks.5.gz	380	man/man5/githooks.5.gz
Lines 393-398 man/man7/gitdiffcore.7.gz Link Here
393	man/man7/giteveryday.7.gz	390	man/man7/giteveryday.7.gz
394	man/man7/gitglossary.7.gz	391	man/man7/gitglossary.7.gz
395	man/man7/gitnamespaces.7.gz	392	man/man7/gitnamespaces.7.gz
		393	man/man7/gitremote-helpers.7.gz
396	man/man7/gitrevisions.7.gz	394	man/man7/gitrevisions.7.gz
397	man/man7/gitsubmodules.7.gz	395	man/man7/gitsubmodules.7.gz
398	man/man7/gittutorial-2.7.gz	396	man/man7/gittutorial-2.7.gz
Lines 974-981 man/man7/gitworkflows.7.gz Link Here
974	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html	972	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.html
975	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.txt	973	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-fd.txt
976	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-helpers.html	974	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-helpers.html
977	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.html
978	%%HTMLDOCS%%%%DOCSDIR%%/git-remote-testgit.txt
979	%%HTMLDOCS%%%%DOCSDIR%%/git-remote.html	975	%%HTMLDOCS%%%%DOCSDIR%%/git-remote.html
980	%%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt	976	%%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt
981	%%HTMLDOCS%%%%DOCSDIR%%/git-repack.html	977	%%HTMLDOCS%%%%DOCSDIR%%/git-repack.html
Lines 1271-1276 share/emacs/site-lisp/git/git.el Link Here
1271	%%CONTRIB%%share/git-core/contrib/coccinelle/README	1267	%%CONTRIB%%share/git-core/contrib/coccinelle/README
1272	%%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci	1268	%%CONTRIB%%share/git-core/contrib/coccinelle/array.cocci
1273	%%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci	1269	%%CONTRIB%%share/git-core/contrib/coccinelle/commit.cocci
		1270	%%CONTRIB%%share/git-core/contrib/coccinelle/flex_alloc.cocci
1274	%%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci	1271	%%CONTRIB%%share/git-core/contrib/coccinelle/free.cocci
1275	%%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci	1272	%%CONTRIB%%share/git-core/contrib/coccinelle/object_id.cocci
1276	%%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci	1273	%%CONTRIB%%share/git-core/contrib/coccinelle/preincr.cocci