Thank you for submitting these patches.
I merged them, but I manually had to add your last name which was missing in all three of them. Could you please check your git configuration?
Best, -Michael
On 29 Sep 2020, at 10:17, Erik ummeegge@ipfire.org wrote:
Several changes s been made since version 2.12.2 . The documentation RelNotes of Git can be found in here --> https://github.com/git/git/tree/master/Documentation/RelNotes .
Signed-off-by: Erik ummeegge@ipfire.org
config/rootfiles/packages/git | 77 ++++++++++++++++++++++++++----------------- lfs/git | 8 ++--- 2 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 52a2042ee..df159acb4 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -5,25 +5,6 @@ usr/bin/git-shell usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk -usr/lib/perl5/site_perl/5.30.0/Error.pm -#usr/lib/perl5/site_perl/5.30.0/Git -usr/lib/perl5/site_perl/5.30.0/Git.pm -usr/lib/perl5/site_perl/5.30.0/Git/I18N.pm -usr/lib/perl5/site_perl/5.30.0/Git/IndexInfo.pm -usr/lib/perl5/site_perl/5.30.0/Git/SVN -#usr/lib/perl5/site_perl/5.30.0/Git/SVN.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Editor.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Fetcher.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/GlobSpec.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Log.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Memoize/YAML.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Migration.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Prompt.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Ra.pm -#usr/lib/perl5/site_perl/5.30.0/Git/SVN/Utils.pm -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Git/.packlist #usr/libexec/git-core #usr/libexec/git-core/git usr/libexec/git-core/git-add @@ -37,6 +18,7 @@ usr/libexec/git-core/git-bisect usr/libexec/git-core/git-bisect--helper usr/libexec/git-core/git-blame usr/libexec/git-core/git-branch +usr/libexec/git-core/git-bugreport usr/libexec/git-core/git-bundle usr/libexec/git-core/git-cat-file usr/libexec/git-core/git-check-attr @@ -52,6 +34,7 @@ usr/libexec/git-core/git-clean usr/libexec/git-core/git-clone usr/libexec/git-core/git-column usr/libexec/git-core/git-commit +usr/libexec/git-core/git-commit-graph usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects @@ -70,6 +53,7 @@ usr/libexec/git-core/git-diff-index usr/libexec/git-core/git-diff-tree usr/libexec/git-core/git-difftool usr/libexec/git-core/git-difftool--helper +usr/libexec/git-core/git-env--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch @@ -117,6 +101,7 @@ usr/libexec/git-core/git-mergetool usr/libexec/git-core/git-mergetool--lib usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree +usr/libexec/git-core/git-multi-pack-index usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev usr/libexec/git-core/git-notes @@ -131,11 +116,10 @@ usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport +usr/libexec/git-core/git-range-diff usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase -usr/libexec/git-core/git-rebase--am -usr/libexec/git-core/git-rebase--interactive -usr/libexec/git-core/git-rebase--merge +usr/libexec/git-core/git-rebase--preserve-merges usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-remote @@ -151,6 +135,7 @@ usr/libexec/git-core/git-replace usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset +usr/libexec/git-core/git-restore usr/libexec/git-core/git-rev-list usr/libexec/git-core/git-rev-parse usr/libexec/git-core/git-revert @@ -166,6 +151,7 @@ usr/libexec/git-core/git-show usr/libexec/git-core/git-show-branch usr/libexec/git-core/git-show-index usr/libexec/git-core/git-show-ref +usr/libexec/git-core/git-sparse-checkout usr/libexec/git-core/git-stage usr/libexec/git-core/git-stash usr/libexec/git-core/git-status @@ -173,6 +159,7 @@ usr/libexec/git-core/git-stripspace usr/libexec/git-core/git-submodule usr/libexec/git-core/git-submodule--helper usr/libexec/git-core/git-svn +usr/libexec/git-core/git-switch usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag usr/libexec/git-core/git-unpack-file @@ -201,6 +188,7 @@ usr/libexec/git-core/mergetools/diffuse usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge usr/libexec/git-core/mergetools/examdiff +usr/libexec/git-core/mergetools/guiffy usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 usr/libexec/git-core/mergetools/gvimdiff3 @@ -209,6 +197,7 @@ usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld usr/libexec/git-core/mergetools/opendiff usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/smerge usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff @@ -223,9 +212,11 @@ usr/share/git-core/templates/description #usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample +usr/share/git-core/templates/hooks/fsmonitor-watchman.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample +usr/share/git-core/templates/hooks/pre-merge-commit.sample usr/share/git-core/templates/hooks/pre-push.sample usr/share/git-core/templates/hooks/pre-rebase.sample usr/share/git-core/templates/hooks/pre-receive.sample @@ -247,6 +238,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/choose_font.tcl #usr/share/git-gui/lib/choose_repository.tcl #usr/share/git-gui/lib/choose_rev.tcl +#usr/share/git-gui/lib/chord.tcl #usr/share/git-gui/lib/class.tcl #usr/share/git-gui/lib/commit.tcl #usr/share/git-gui/lib/console.tcl @@ -308,6 +300,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg #usr/share/gitk/lib/msgs/vi.msg +#usr/share/gitk/lib/msgs/zh_cn.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -318,6 +311,8 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/bg/LC_MESSAGES/git.mo #usr/share/locale/ca/LC_MESSAGES/git.mo #usr/share/locale/de/LC_MESSAGES/git.mo +#usr/share/locale/el/LC_MESSAGES/git.mo +#usr/share/locale/es/LC_MESSAGES/git.mo #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo @@ -325,14 +320,34 @@ usr/share/git-core/templates/info/exclude #usr/share/locale/pt_PT/LC_MESSAGES/git.mo #usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo +#usr/share/locale/tr/LC_MESSAGES/git.mo #usr/share/locale/vi/LC_MESSAGES/git.mo #usr/share/locale/zh_CN/LC_MESSAGES/git.mo -#usr/share/man/man3/Git.3 -#usr/share/man/man3/Git::I18N.3 -#usr/share/man/man3/Git::SVN::Editor.3 -#usr/share/man/man3/Git::SVN::Fetcher.3 -#usr/share/man/man3/Git::SVN::Memoize::YAML.3 -#usr/share/man/man3/Git::SVN::Prompt.3 -#usr/share/man/man3/Git::SVN::Ra.3 -#usr/share/man/man3/Git::SVN::Utils.3 -#usr/share/man/man3/private-Error.3 +#usr/share/locale/zh_TW/LC_MESSAGES/git.mo +#usr/share/perl5 +#usr/share/perl5/FromCPAN +usr/share/perl5/FromCPAN/Error.pm +#usr/share/perl5/FromCPAN/Mail +#usr/share/perl5/FromCPAN/Mail/Address.pm +#usr/share/perl5/Git +usr/share/perl5/Git.pm +usr/share/perl5/Git/I18N.pm +usr/share/perl5/Git/IndexInfo.pm +#usr/share/perl5/Git/LoadCPAN +#usr/share/perl5/Git/LoadCPAN.pm +#usr/share/perl5/Git/LoadCPAN/Error.pm +#usr/share/perl5/Git/LoadCPAN/Mail +#usr/share/perl5/Git/LoadCPAN/Mail/Address.pm +#usr/share/perl5/Git/Packet.pm +usr/share/perl5/Git/SVN +#usr/share/perl5/Git/SVN.pm +#usr/share/perl5/Git/SVN/Editor.pm +#usr/share/perl5/Git/SVN/Fetcher.pm +#usr/share/perl5/Git/SVN/GlobSpec.pm +#usr/share/perl5/Git/SVN/Log.pm +#usr/share/perl5/Git/SVN/Memoize +#usr/share/perl5/Git/SVN/Memoize/YAML.pm +#usr/share/perl5/Git/SVN/Migration.pm +#usr/share/perl5/Git/SVN/Prompt.pm +#usr/share/perl5/Git/SVN/Ra.pm +#usr/share/perl5/Git/SVN/Utils.pm diff --git a/lfs/git b/lfs/git index 86ba8d98d..2928d59e6 100644 --- a/lfs/git +++ b/lfs/git @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.12.2 +VER = 2.28.0
THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 16 +PAK_VER = 17
DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ad5ae08664c40caf074392abc301cccd +$(DL_FILE)_MD5 = 5fde0206768ed70092d1fcc8f447251a
install : $(TARGET)
-- 2.12.2