Merge pull request git-lfs#168 from hawser/v0.4.0-bugs

V0.4.0 bugs

Author: technoweenie

commands/command_add.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"github.com/hawser/git-hawser/hawser"
 	"github.com/spf13/cobra"
+	"io"
 	"os"
+	"strings"
 )
 
 var (
@@ -23,13 +25,20 @@ func addCommand(cmd *cobra.Command, args []string) {
 		return
 	}
 
+	addTrailingLinebreak := needsTrailingLinebreak(".gitattributes")
 	knownPaths := findPaths()
 	attributesFile, err := os.OpenFile(".gitattributes", os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
 	if err != nil {
 		Print("Error opening .gitattributes file")
 		return
 	}
 
+	if addTrailingLinebreak {
+		if _, err := attributesFile.WriteString("\n"); err != nil {
+			Print("Error writing to .gitattributes")
+		}
+	}
+
 	for _, t := range args {
 		isKnownPath := false
 		for _, k := range knownPaths {
@@ -54,6 +63,28 @@ func addCommand(cmd *cobra.Command, args []string) {
 	attributesFile.Close()
 }
 
+func needsTrailingLinebreak(filename string) bool {
+	file, err := os.Open(filename)
+	if err != nil {
+		return false
+	}
+
+	defer file.Close()
+	buf := make([]byte, 16384)
+	bytesRead := 0
+	for {
+		n, err := file.Read(buf)
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			return false
+		}
+		bytesRead = n
+	}
+
+	return !strings.HasSuffix(string(buf[0:bytesRead]), "\n")
+}
+
 func init() {
 	RootCmd.AddCommand(addCmd)
 }

commands/path_test.go

@@ -47,11 +47,51 @@ func TestPathOnEmptyRepository(t *testing.T) {
 
 	cmd := repo.Command("add", "*.gif")
 	cmd.Output = "Adding path *.gif"
+
+	cmd.Before(func() {
+		// write attributes file in .git
+		path := filepath.Join(".gitattributes")
+		repo.WriteFile(path, "*.mov filter=hawser -crlf\n")
+	})
+
+	cmd.After(func() {
+		// assert path was added
+		assert.Equal(t, "*.mov filter=hawser -crlf\n*.gif filter=hawser -crlf\n", repo.ReadFile(".gitattributes"))
+
+		expected := "Listing paths\n    *.mov (.gitattributes)\n    *.gif (.gitattributes)\n"
+
+		assert.Equal(t, expected, repo.MediaCmd("path"))
+
+		// assert hook was created
+		stat, err := os.Stat(prePushHookFile)
+		assert.Equal(t, nil, err)
+		assert.Equal(t, false, stat.IsDir())
+	})
+
+	cmd = repo.Command("path")
+	cmd.Output = "Listing paths"
+}
+
+func TestAddPathWithoutTrailingLinebreak(t *testing.T) {
+	repo := NewRepository(t, "empty")
+	defer repo.Test()
+
+	prePushHookFile := filepath.Join(repo.Path, ".git", "hooks", "pre-push")
+
+	cmd := repo.Command("add", "*.gif")
+	cmd.Output = "Adding path *.gif"
+
+	cmd.Before(func() {
+		// write attributes file in .git
+		path := filepath.Join(".gitattributes")
+		repo.WriteFile(path, "*.mov filter=hawser -crlf")
+	})
+
 	cmd.After(func() {
 		// assert path was added
-		assert.Equal(t, "*.gif filter=hawser -crlf\n", repo.ReadFile(".gitattributes"))
+		assert.Equal(t, "*.mov filter=hawser -crlf\n*.gif filter=hawser -crlf\n", repo.ReadFile(".gitattributes"))
 
-		expected := "Listing paths\n    *.gif (.gitattributes)\n"
+		expected := "Listing paths\n    *.mov (.gitattributes)\n    *.gif (.gitattributes)\n"
 
 		assert.Equal(t, expected, repo.MediaCmd("path"))
 

hawser/client.go

@@ -250,7 +250,7 @@ func callExternalPut(filehash, filename string, lm *linkMeta, cb CopyCallback) *
 			verifyReq.Header.Set(h, v)
 		}
 
-		verifyCreds, err := setRequestHeaders(req)
+		verifyCreds, err := setRequestHeaders(verifyReq)
 		if err != nil {
 			return Errorf(err, "Error attempting to verify %s", filename)
 		}