From 2a8dd46ce9b2809174b815145ce472c9220f0943 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mar 04 2018 08:00:53 +0000 Subject: Update to latest version. --- diff --git a/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch b/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch deleted file mode 100644 index 91b5c87..0000000 --- a/4907b21ba4d7ce4a485f7ff32ea3880aad8e6edd.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 3cc37ac..0000000 --- a/a393bb1d7e82b64833f7ab835ca13a7b99cb9af9.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 502e6b7..fc703ff 100644 --- a/git-lfs.spec +++ b/git-lfs.spec @@ -32,19 +32,13 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: git-lfs -Version: 2.3.4 -Release: 6%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Git extension for versioning large files License: MIT 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} @@ -61,6 +55,7 @@ Provides: bundled(golang(github.com/spf13/pflag)) = 580b9be06c33d8ba9dcc87 Provides: bundled(golang(github.com/stretchr/testify)) = 6cb3b85ef5a0efef77caef88363ec4d4b5c0976d Provides: bundled(golang(github.com/ThomsonReutersEikon/go-ntlm/ntlm)) = b00ec39bbdd04f845950f4dbb4fd0a2c3155e830 Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = 6b67b3fab74d992bd07f72550006ab2c6907c416 +Provides: bundled(golang(github.com/git-lfs/wildmatch)) = 8a0518641565a619e62a2738c7d4498fc345daf6 %else BuildRequires: golang(github.com/bgentry/go-netrc/netrc) BuildRequires: golang(github.com/kr/pty) @@ -74,6 +69,7 @@ BuildRequires: golang(github.com/xeipuuv/gojsonpointer) BuildRequires: golang(github.com/xeipuuv/gojsonreference) BuildRequires: golang(github.com/xeipuuv/gojsonschema) BuildRequires: golang(github.com/pkg/errors) +BuildRequires: golang(github.com/git-lfs/wildmatch) %endif %if 0%{?with_manpages} @@ -160,7 +156,7 @@ popd for go in test/cmd/*.go; do %gobuild -o "bin/$(basename $go .go)" "$go" done -%{gobuild} -o "bin/git-lfs-test-server-api" "test/git-lfs-test-server-api/*.go" +%gobuild -o "bin/git-lfs-test-server-api" test/git-lfs-test-server-api/*.go %endif @@ -254,6 +250,9 @@ popd %changelog +* Sun Mar 04 2018 Elliott Sales de Andrade - 2.4.0-1 +- Update to latest release. + * Thu Feb 08 2018 Elliott Sales de Andrade - 2.3.4-6 - Add patches to build with Go 1.10. diff --git a/wait-longer.patch b/wait-longer.patch deleted file mode 100644 index 2bb219a..0000000 --- a/wait-longer.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit f90446aec14f82d223c22f13efec17752b6ed7bb -Author: Elliott Sales de Andrade -Date: Fri Nov 3 23:27:57 2017 -0400 - - Wait longer for test lfs server to start. - - Also, back off on polling a bit after the first check to reduce any I/O - contention that might slow things down even more. Instead of 5 seconds, - this will wait up to about 60 seconds for files created by the test - server to appear. This allows very slow systems to be able to pass - tests. - - Finally, add a message if the file doesn't appear to make it clear what - went wrong. - -diff --git a/test/testhelpers.sh b/test/testhelpers.sh -index 531d934b..cb31d2ef 100644 ---- a/test/testhelpers.sh -+++ b/test/testhelpers.sh -@@ -258,15 +258,20 @@ size %s - wait_for_file() { - local filename="$1" - n=0 -- while [ $n -lt 10 ]; do -+ wait_time=1 -+ while [ $n -lt 17 ]; do - if [ -s $filename ]; then - return 0 - fi - -- sleep 0.5 -+ sleep $wait_time - n=`expr $n + 1` -+ if [ $wait_time -lt 4 ]; then -+ wait_time=`expr $wait_time \* 2` -+ fi - done - -+ echo "$filename did not appear after 60 seconds." - return 1 - } -