diff --git a/CHANGELOG.md b/CHANGELOG.md index 8359312d..cf3b1fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Git LFS Changelog +## 1.1.2 (1 March, 2016) + +* Fix Base64 issues with `?` #989 (@technoweenie) +* Fix zombie git proc issue #1012 (@rlaakkol) +* Fix problems with files containing unicode characters #1016 (@technoweenie) +* Fix panic in `git cat-file` parser #1006 (@technoweenie) +* Display error messages in non-fatal errors #1028 #1039 #1042 (@technoweenie) +* Fix concurrent map access in progress meter (@technoweenie) + ## 1.1.1 (4 February, 2016) ### Features diff --git a/Nut.toml b/Nut.toml index b4bfe66e..9d174e3e 100644 --- a/Nut.toml +++ b/Nut.toml @@ -1,7 +1,7 @@ [application] name = "git-lfs" -version = "1.1.1" +version = "1.1.2" authors = [ "Rick Olson ", "Scott Barron ", diff --git a/commands/command_pre_push.go b/commands/command_pre_push.go index cdc3f7fd..64e129a3 100644 --- a/commands/command_pre_push.go +++ b/commands/command_pre_push.go @@ -129,6 +129,9 @@ func prePushRef(left, right string) { if Debugging || lfs.IsFatalError(err) { LoggedError(err, err.Error()) } else { + if inner := lfs.GetInnerError(err); inner != nil { + Error(inner.Error()) + } Error(err.Error()) } } diff --git a/commands/command_push.go b/commands/command_push.go index 01d8f66b..b7d2f300 100644 --- a/commands/command_push.go +++ b/commands/command_push.go @@ -121,11 +121,7 @@ func uploadsWithObjectIDs(oids []string) *lfs.TransferQueue { u, err := lfs.NewUploadable(oid, "") if err != nil { - if Debugging || lfs.IsFatalError(err) { - Panic(err, err.Error()) - } else { - Exit(err.Error()) - } + ExitWithError(err) } uploads = append(uploads, u) } @@ -206,6 +202,9 @@ func pushCommand(cmd *cobra.Command, args []string) { if Debugging || lfs.IsFatalError(err) { LoggedError(err, err.Error()) } else { + if inner := lfs.GetInnerError(err); inner != nil { + Error(inner.Error()) + } Error(err.Error()) } } diff --git a/debian/changelog b/debian/changelog index 0939751e..08e955e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-lfs (1.1.2) stable; urgency=low + + * New upstream version + + -- Stephen Gelman Tue, 1 March 2016 14:29:00 +0000 + git-lfs (1.1.1) stable; urgency=low * New upstream version diff --git a/git/git.go b/git/git.go index a177e900..ebcd87f7 100644 --- a/git/git.go +++ b/git/git.go @@ -151,12 +151,15 @@ func RemoteList() ([]string, error) { return nil, fmt.Errorf("Failed to call git remote: %v", err) } cmd.Start() + defer cmd.Wait() + scanner := bufio.NewScanner(outp) var ret []string for scanner.Scan() { ret = append(ret, strings.TrimSpace(scanner.Text())) } + return ret, nil } @@ -313,6 +316,8 @@ func RecentBranches(since time.Time, includeRemoteBranches bool, onlyRemote stri return nil, fmt.Errorf("Failed to call git for-each-ref: %v", err) } cmd.Start() + defer cmd.Wait() + scanner := bufio.NewScanner(outp) // Output is like this: @@ -351,7 +356,6 @@ func RecentBranches(since time.Time, includeRemoteBranches bool, onlyRemote stri ret = append(ret, &Ref{ref, reftype, sha}) } } - cmd.Wait() return ret, nil diff --git a/lfs/lfs.go b/lfs/lfs.go index 5fd754c9..ebf6884c 100644 --- a/lfs/lfs.go +++ b/lfs/lfs.go @@ -15,7 +15,7 @@ import ( ) const ( - Version = "1.1.1" + Version = "1.1.2" tempDirPerms = 0755 localMediaDirPerms = 0755 localLogDirPerms = 0755 diff --git a/rpm/SPECS/git-lfs.spec b/rpm/SPECS/git-lfs.spec index 5f7dbe07..96031842 100644 --- a/rpm/SPECS/git-lfs.spec +++ b/rpm/SPECS/git-lfs.spec @@ -1,5 +1,5 @@ Name: git-lfs -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Git extension for versioning large files diff --git a/script/windows-installer/inno-setup-git-lfs-installer.iss b/script/windows-installer/inno-setup-git-lfs-installer.iss index 61b9a404..e910069d 100644 --- a/script/windows-installer/inno-setup-git-lfs-installer.iss +++ b/script/windows-installer/inno-setup-git-lfs-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Git LFS" -#define MyAppVersion "1.1.1" +#define MyAppVersion "1.1.2" #define MyAppPublisher "GitHub, Inc" #define MyAppURL "https://git-lfs.github.com/" #define MyAppFilePrefix "git-lfs-windows" diff --git a/test/test-credentials-no-prompt.sh b/test/test-credentials-no-prompt.sh index bced8aed..b19b554a 100755 --- a/test/test-credentials-no-prompt.sh +++ b/test/test-credentials-no-prompt.sh @@ -12,6 +12,14 @@ if [[ "$(git config --system credential.helper)" -ne "" ]]; then exit fi +# if there is a system cred helper we can't run this test +# can't disable without changing state outside test & probably don't have permission +# this is common on OS X with certain versions of Git installed, default cred helper +if [[ "$(git config --system credential.helper)" -ne "" ]]; then + echo "skip: $0 (system cred helper we can't disable)" + exit +fi + begin_test "attempt private access without credential helper" ( set -e