diff --git a/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch b/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch new file mode 100644 index 0000000..91b5c87 --- /dev/null +++ b/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch @@ -0,0 +1,22 @@ +From 4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd Mon Sep 17 00:00:00 2001 +From: rick olson +Date: Thu, 19 Oct 2017 12:43:57 -0600 +Subject: [PATCH] commands: fill in missing printf arg + +--- + commands/command_filter_process.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/commands/command_filter_process.go b/commands/command_filter_process.go +index d21dad1c8..7847d3967 100644 +--- a/commands/command_filter_process.go ++++ b/commands/command_filter_process.go +@@ -200,7 +200,7 @@ func filterCommand(cmd *cobra.Command, args []string) { + } + + if len(malformedOnWindows) > 0 { +- fmt.Fprintf(os.Stderr, "Encountered %d file(s) that may not have been copied correctly on Windows:\n") ++ fmt.Fprintf(os.Stderr, "Encountered %d file(s) that may not have been copied correctly on Windows:\n", len(malformedOnWindows)) + + for _, m := range malformedOnWindows { + fmt.Fprintf(os.Stderr, "\t%s\n", m) diff --git a/a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch b/a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch new file mode 100644 index 0000000..3cc37ac --- /dev/null +++ b/a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch @@ -0,0 +1,63 @@ +From a393bb1d7e82b64833f7ab835ca13a7b99cb9af9 Mon Sep 17 00:00:00 2001 +From: Taylor Blau +Date: Thu, 14 Dec 2017 21:07:06 -0500 +Subject: [PATCH] test/git-lfs-test-server-api: use correct formatting verb + +--- + test/git-lfs-test-server-api/testdownload.go | 4 ++-- + test/git-lfs-test-server-api/testupload.go | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/test/git-lfs-test-server-api/testdownload.go b/test/git-lfs-test-server-api/testdownload.go +index a3e6503f4..35fe321a3 100644 +--- a/test/git-lfs-test-server-api/testdownload.go ++++ b/test/git-lfs-test-server-api/testdownload.go +@@ -52,7 +52,7 @@ func downloadAllMissing(manifest *tq.Manifest, oidsExist, oidsMissing []TestObje + for _, o := range retobjs { + link, _ := o.Rel("download") + if link != nil { +- errbuf.WriteString(fmt.Sprintf("Download link should not exist for %s, was %s\n", o.Oid, link)) ++ errbuf.WriteString(fmt.Sprintf("Download link should not exist for %s, was %+v\n", o.Oid, link)) + } + if o.Error == nil { + errbuf.WriteString(fmt.Sprintf("Download should include an error for missing object %s\n", o.Oid)) +@@ -96,7 +96,7 @@ func downloadMixed(manifest *tq.Manifest, oidsExist, oidsMissing []TestObject) e + link, _ := o.Rel("download") + if missingSet.Contains(o.Oid) { + if link != nil { +- errbuf.WriteString(fmt.Sprintf("Download link should not exist for %s, was %s\n", o.Oid, link)) ++ errbuf.WriteString(fmt.Sprintf("Download link should not exist for %s, was %+v\n", o.Oid, link)) + } + if o.Error == nil { + errbuf.WriteString(fmt.Sprintf("Download should include an error for missing object %s", o.Oid)) +diff --git a/test/git-lfs-test-server-api/testupload.go b/test/git-lfs-test-server-api/testupload.go +index e7b4552d1..dde5e9ec1 100644 +--- a/test/git-lfs-test-server-api/testupload.go ++++ b/test/git-lfs-test-server-api/testupload.go +@@ -53,7 +53,7 @@ func uploadAllExists(manifest *tq.Manifest, oidsExist, oidsMissing []TestObject) + for _, o := range retobjs { + link, _ := o.Rel("upload") + if link == nil { +- errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %s\n", o.Oid, link)) ++ errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %+v\n", o.Oid, link)) + } + } + +@@ -92,7 +92,7 @@ func uploadMixed(manifest *tq.Manifest, oidsExist, oidsMissing []TestObject) err + link, _ := o.Rel("upload") + if existSet.Contains(o.Oid) { + if link != nil { +- errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %s\n", o.Oid, link)) ++ errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %+v\n", o.Oid, link)) + } + } + if missingSet.Contains(o.Oid) && link == nil { +@@ -166,7 +166,7 @@ func uploadEdgeCases(manifest *tq.Manifest, oidsExist, oidsMissing []TestObject) + if code, iserror := errorCodeMap[o.Oid]; iserror { + reason, _ := errorReasonMap[o.Oid] + if link != nil { +- errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %s, reason %s\n", o.Oid, link, reason)) ++ errbuf.WriteString(fmt.Sprintf("Upload link should not exist for %s, was %+v, reason %s\n", o.Oid, link, reason)) + } + if o.Error == nil { + errbuf.WriteString(fmt.Sprintf("Upload should include an error for invalid object %s, reason %s", o.Oid, reason)) diff --git a/git-lfs.spec b/git-lfs.spec index 8b58969..502e6b7 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -33,7 +33,7 @@ Name: git-lfs Version: 2.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Git extension for versioning large files License: MIT @@ -41,6 +41,10 @@ URL: https://git-lfs.github.io/ Source0: https://%{provider_prefix}/archive/v%{version}/%{name}-%{version}.tar.gz # https://github.com/git-lfs/git-lfs/pull/2716 Patch0001: wait-longer.patch +# https://github.com/git-lfs/git-lfs/pull/2678 +Patch0002: 4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch +# Parts of https://github.com/git-lfs/git-lfs/pull/2788 +Patch0003: a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch ExclusiveArch: %{go_arches} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -250,6 +254,9 @@ popd %changelog +* Thu Feb 08 2018 Elliott Sales de Andrade - 2.3.4-6 +- Add patches to build with Go 1.10. + * Wed Feb 07 2018 Fedora Release Engineering - 2.3.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -259,25 +266,25 @@ popd - Don't build man pages on RHEL due to missing ronn - Don't build html versions of man pages -* Fri Dec 01 2017 Elliott Sales de Andrade 2.3.4-3 +* Fri Dec 01 2017 Elliott Sales de Andrade - 2.3.4-3 - Require git-core instead of git. -* Fri Nov 03 2017 Elliott Sales de Andrade 2.3.4-2 +* Fri Nov 03 2017 Elliott Sales de Andrade - 2.3.4-2 - Patch tests to work on slow systems like arm and aarch builders. - Fix "git lfs help" command. -* Fri Nov 03 2017 Elliott Sales de Andrade 2.3.4-1 +* Fri Nov 03 2017 Elliott Sales de Andrade - 2.3.4-1 - Update to latest release. - Run all tests during build. -* Fri Sep 01 2017 Elliott Sales de Andrade 2.2.1-3 +* Fri Sep 01 2017 Elliott Sales de Andrade - 2.2.1-3 - Remove redundant doc tag on manpages. - Use path macros in %%post/%%postun. -* Thu Aug 31 2017 Elliott Sales de Andrade 2.2.1-2 +* Thu Aug 31 2017 Elliott Sales de Andrade - 2.2.1-2 - Disable unnecessary subpackages. -* Sun Jul 30 2017 Elliott Sales de Andrade 2.2.1-1 +* Sun Jul 30 2017 Elliott Sales de Andrade - 2.2.1-1 - Update to latest version. * Wed Apr 19 2017 Elliott Sales de Andrade - 2.0.2-2