Merge branch 'master' into report-errs

Author: ttaylorr

appveyor.yml

@@ -1,56 +1,17 @@
-version: 1.0.{build}
-init:
-- cmd: >-
-    set REPO_DIR=%cd%
-
-
-    mkdir %BASHROOT%
-
-    cd %BASHROOT%
-
-
-    curl -LOk https://github.com/git-for-windows/git/releases/download/v2.6.2.windows.1/PortableGit-2.6.2-64-bit.7z.exe
-
-
-    7z x PortableGit-2.6.2-64-bit.7z.exe > nul
-
-
-    mkdir c:\go15
-
-    cd \go15
-
-
-    curl -LO https://storage.googleapis.com/golang/go1.5.1.windows-amd64.zip
-
-    unzip -o go1.5.1.windows-amd64.zip > nul
-
-
-    set PATH=%BASHROOT%\bin;%GOROOT%\bin;%PATH%
-
-
-    cd %REPO_DIR%
-environment:
-  GOROOT: c:\go15\go
-  BASHROOT: c:\bash2
 install:
-- cmd: 
-build_script:
-- cmd: >-
-    mkdir src\github.com\github
-
-
-    mklink /J src\github.com\github\git-lfs .
+  - cinst InnoSetup -y
+  - set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
 
+build_script:
+  - bash -c 'GOARCH=386 script/bootstrap'
+  - mv bin\git-lfs git-lfs-x86.exe
+  - bash -c 'GOARCH=amd64 script/bootstrap'
+  - mv bin\git-lfs git-lfs-x64.exe
 
-    set GOPATH=%CD%
-
-
-    go version
-
-
-    bash script\bootstrap
-
+after_build:
+  - iscc script\windows-installer\inno-setup-git-lfs-installer.iss
 
-    mv bin\git-lfs bin\git-lfs.exe
 artifacts:
-- path: bin\git-lfs.exe
+  - path: git-lfs-x86.exe
+  - path: git-lfs-x64.exe
+  - path: git-lfs-windows-*.exe

commands/command_fetch.go

@@ -42,12 +42,7 @@ func fetchCommand(cmd *cobra.Command, args []string) {
 		}
 		cfg.CurrentRemote = args[0]
 	} else {
-		// Actively find the default remote, don't just assume origin
-		defaultRemote, err := git.DefaultRemote()
-		if err != nil {
-			Exit("No default remote")
-		}
-		cfg.CurrentRemote = defaultRemote
+		cfg.CurrentRemote = ""
 	}
 
 	if len(args) > 1 {
@@ -246,6 +241,16 @@ func fetchPointers(pointers []*lfs.WrappedPointer, include, exclude []string) bo
 // Fetch and report completion of each OID to a channel (optional, pass nil to skip)
 // Returns true if all completed with no errors, false if errors were written to stderr/log
 func fetchAndReportToChan(allpointers []*lfs.WrappedPointer, include, exclude []string, out chan<- *lfs.WrappedPointer) bool {
+	// Lazily initialize the current remote.
+	if len(cfg.CurrentRemote) == 0 {
+		// Actively find the default remote, don't just assume origin
+		defaultRemote, err := git.DefaultRemote()
+		if err != nil {
+			Exit("No default remote")
+		}
+		cfg.CurrentRemote = defaultRemote
+	}
+
 	ready, pointers, totalSize := readyAndMissingPointers(allpointers, include, exclude)
 	q := lfs.NewDownloadQueue(len(pointers), totalSize, false)
 

docs/man/git-lfs-clean.1.ronn

@@ -13,8 +13,12 @@ LFS pointer file for that file to standard output.
 Clean is typically run by Git's clean filter, configured by the repository's
 Git attributes.
 
+Clean is not part of the user-facing Git plumbing commands. To preview the
+pointer of a large file as it would be generated, see the git-lfs-pointer(1)
+command.
+
 ## SEE ALSO
 
-git-lfs-install(1), git-lfs-push(1), gitattributes(5).
+git-lfs-install(1), git-lfs-push(1), git-lfs-pointer(1), gitattributes(5).
 
 Part of the git-lfs(1) suite.

script/bootstrap

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-# Only set GOPATH on non-Windows platforms as Windows can't do the symlinking
-# that we need.
-if [ -z "$GOPATH" ] && uname -s | grep -vq "_NT-"; then
+if uname -s | grep -q "_NT-"; then
+  # Tell Cygwin / MSYS to really create symbolic links.
+  export CYGWIN="$CYGWIN winsymlinks:nativestrict"
+  export MSYS="$MSYS winsymlinks:nativestrict"
+fi
+
+if [ -z "$GOPATH" ]; then
   export GOPATH="$(pwd)"
   mkdir -p src/github.com/github
   [ -h src/github.com/github/git-lfs ] ||

script/fmt

@@ -6,7 +6,7 @@ hash goimports 2>/dev/null && {
 }
 
 # don't run gofmt in these directories
-ignored=(/bin/ /docs/ /log/ /man/ /tmp/ /vendor/ /rpm/ /docker/ /debian/)
+ignored=(/bin/ /docs/ /log/ /man/ /tmp/ /vendor/ /rpm/ /docker/ /debian/ /src/)
 for i in */ ; do
   if [[ ! ${ignored[*]} =~ "/$i" ]]; then
     $formatter -w -l "$@" "${i%?}"

script/windows-installer/git-lfs-logo.bmp

@@ -30,6 +30,8 @@ DirExistsWarning=no
 DisableReadyPage=True
 ArchitecturesInstallIn64BitMode=x64
 ChangesEnvironment=yes
+SetupIconFile=git-lfs-logo.ico
+WizardSmallImageFile=git-lfs-logo.bmp
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"