Attachment 156270 Details for Bug 199881 – patch

[patch] patch

git.diff (text/plain), 10.87 KB, created by Kurt Jaeger on 2015-05-03 10:08:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-05-03 10:08:24 UTC

Size: 10.87 KB

patch

obsolete

>diff -r -u -N devel/git/Makefile /usr/home/pi/myp/devel/git/Makefile
>--- devel/git/Makefile	2015-04-29 21:25:12.000000000 +0200
>+++ /usr/home/pi/myp/devel/git/Makefile	2015-05-03 10:35:53.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/git/Makefile 384892 2015-04-28 10:06:36Z garga $
> 
> PORTNAME=	git
>-PORTVERSION=	2.3.7
>+PORTVERSION=	2.4.0
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG
> MASTER_SITE_SUBDIR=	software/scm/git
>diff -r -u -N devel/git/distinfo /usr/home/pi/myp/devel/git/distinfo
>--- devel/git/distinfo	2015-04-29 21:25:12.000000000 +0200
>+++ /usr/home/pi/myp/devel/git/distinfo	2015-05-03 10:36:12.000000000 +0200
>@@ -1,6 +1,6 @@
>-SHA256 (git-2.3.7.tar.xz) = eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b
>-SIZE (git-2.3.7.tar.xz) = 3621804
>-SHA256 (git-manpages-2.3.7.tar.xz) = 77e783b0ff15f6c0048bb6c4b79b141dd045516a45fe72c2a4b6fe1434e476ae
>-SIZE (git-manpages-2.3.7.tar.xz) = 371556
>-SHA256 (git-htmldocs-2.3.7.tar.xz) = 8e797f1d50ef4f5681fab9bd2e45ac6c1d75b4a87f67d7a55ac37e1befaefc7f
>-SIZE (git-htmldocs-2.3.7.tar.xz) = 987448
>+SHA256 (git-2.4.0.tar.xz) = b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24
>+SIZE (git-2.4.0.tar.xz) = 3681516
>+SHA256 (git-manpages-2.4.0.tar.xz) = b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7
>+SIZE (git-manpages-2.4.0.tar.xz) = 372716
>+SHA256 (git-htmldocs-2.4.0.tar.xz) = 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7
>+SIZE (git-htmldocs-2.4.0.tar.xz) = 990744
>diff -r -u -N devel/git/pkg-plist /usr/home/pi/myp/devel/git/pkg-plist
>--- devel/git/pkg-plist	2015-04-29 21:25:12.000000000 +0200
>+++ /usr/home/pi/myp/devel/git/pkg-plist	2015-05-03 10:42:53.000000000 +0200
>@@ -396,6 +396,7 @@
> %%NLS%%share/locale/is/LC_MESSAGES/git.mo
> %%NLS%%share/locale/it/LC_MESSAGES/git.mo
> %%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
>+%%NLS%%share/locale/ru/LC_MESSAGES/git.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/git.mo
> %%NLS%%share/locale/vi/LC_MESSAGES/git.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
>@@ -758,92 +759,92 @@
> %%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
> %%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
> %%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/bitmap-format.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.html
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-argv-array.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-credentials.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-ref-iteration.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-ref-iteration.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-error-handling.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-error-handling.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hashmap.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-ref-iteration.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-ref-iteration.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.html
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sha1-array.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-sigchain.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-trace.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/bitmap-format.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/http-protocol.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
> %%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.html
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.txt
>-%%HTMLDOCS%%%%DOCSDIR%%/technical/index-format.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-capabilities.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/protocol-common.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.html
>+%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt
> %%HTMLDOCS%%%%DOCSDIR%%/git-check-ignore.txt
> %%HTMLDOCS%%%%DOCSDIR%%/git-check-ignore.html
> %%HTMLDOCS%%%%DOCSDIR%%/mergetools-diff.txt
>@@ -1221,6 +1222,7 @@
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.5.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.6.txt
> %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.7.txt
>+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.0.txt
> %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
> %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
> %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css

Actions: View | Diff

Attachments on bug 199881: 156270