Merge pull request #210 from dawidd6/sirupsen/imports

Sirupsen -> sirupsen
2026-09-28 18:26:03 -04:00 · 2018-08-24 07:58:47 +10:00 · 2018-08-23 14:22:03 +02:00 · 2018-08-23 10:19:31 +10:00 · 2018-08-22 11:28:09 -04:00 · 2018-08-22 11:27:45 -04:00
48 changed files with 412 additions and 200 deletions
@@ -1,26 +1,42 @@
-# Golang CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
  build:
    docker:
-      # specify the version
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10

-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
-    #### TEMPLATE_NOTE: go expects specific checkout path representing url
-    #### expecting it in the form of
-    ####   /go/src/github.com/circleci/go-tool
-    ####   /go/src/bitbucket.org/circleci/go-tool
    working_directory: /go/src/github.com/jesseduffield/lazygit
    steps:
      - checkout
+      - run:
+          name: Run tests
+          command: |
+            ./test.sh
+      - run:
+          name: Push on codecov result
+          command: |
+            bash <(curl -s https://codecov.io/bash)

-      # specify any bash command here prefixed with `run: `
-      - run: go test -v ./...
-      - run: bash <(curl -s https://codecov.io/bash)
+  release:
+    docker:
+      - image: circleci/golang:1.10
+    working_directory: /go/src/github.com/jesseduffield/lazygit
+    steps:
+      - checkout
+      - run:
+          name: Run gorelease
+          command: |
+            curl -sL https://git.io/goreleaser | bash
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build
+  release:
+    jobs:
+      - release:
+          filters:
+            tags:
+              only: /v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
@@ -23,6 +23,7 @@ If applicable, add screenshots to help explain your problem.
 **Desktop (please complete the following information):**
 - OS: [e.g. Windows]
 - Lazygit Version [e.g. v0.1.45]
+ - The last commit id if you built project from sources (run : ```git-rev parse HEAD```)

 **Additional context**
 Add any other context about the problem here.
@@ -13,6 +13,7 @@ TODO.md

 # Tests
 test/repos/repo
+coverage.txt

 # Binaries
-lazygit
+lazygit
@@ -2,31 +2,24 @@


 [[projects]]
-  digest = "1:b2339e83ce9b5c4f79405f949429a7f68a9a904fed903c672aac1e7ceb7f5f02"
-  name = "github.com/Sirupsen/logrus"
+  name = "github.com/sirupsen/logrus"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
  version = "v1.0.6"

 [[projects]]
  branch = "master"
-  digest = "1:cd7ba2b29e93e2a8384e813dfc80ebb0f85d9214762e6ca89bb55a58092eab87"
  name = "github.com/cloudfoundry/jibber_jabber"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "bcc4c8345a21301bf47c032ff42dd1aae2fe3027"

 [[projects]]
-  digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
  name = "github.com/davecgh/go-spew"
  packages = ["spew"]
-  pruneopts = "NUT"
  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
  version = "v1.1.0"

 [[projects]]
-  digest = "1:de4a74b504df31145ffa8ca0c4edbffa2f3eb7f466753962184611b618fa5981"
  name = "github.com/emirpasic/gods"
  packages = [
    "containers",
@@ -34,39 +27,31 @@
    "lists/arraylist",
    "trees",
    "trees/binaryheap",
-    "utils",
+    "utils"
  ]
-  pruneopts = "NUT"
  revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46"
  version = "v1.9.0"

 [[projects]]
-  digest = "1:ade392a843b2035effb4b4a2efa2c3bab3eb29b992e98bacf9c898b0ecb54e45"
  name = "github.com/fatih/color"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
  version = "v1.7.0"

 [[projects]]
-  digest = "1:1b91ae0dc69a41d4c2ed23ea5cffb721ea63f5037ca4b81e6d6771fbb8f45129"
  name = "github.com/fsnotify/fsnotify"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
  version = "v1.4.7"

 [[projects]]
  branch = "master"
-  digest = "1:4a8ed9b8cf22bd03bee5d74179fa06a282e4a73b6de949f7a865ff56cd2537e0"
  name = "github.com/golang-collections/collections"
  packages = ["stack"]
-  pruneopts = "NUT"
  revision = "604e922904d35e97f98a774db7881f049cd8d970"

 [[projects]]
  branch = "master"
-  digest = "1:11c6c696067d3127ecf332b10f89394d386d9083f82baf71f40f2da31841a009"
  name = "github.com/hashicorp/hcl"
  packages = [
    ".",
@@ -78,234 +63,185 @@
    "hcl/token",
    "json/parser",
    "json/scanner",
-    "json/token",
+    "json/token"
  ]
-  pruneopts = "NUT"
  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"

 [[projects]]
  branch = "master"
-  digest = "1:62fe3a7ea2050ecbd753a71889026f83d73329337ada66325cbafd5dea5f713d"
  name = "github.com/jbenet/go-context"
  packages = ["io"]
-  pruneopts = "NUT"
  revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4"

 [[projects]]
  branch = "master"
-  digest = "1:c9a848b0484a72da2dae28957b4f67501fe27fa38bc73f4713e454353c0a4a60"
  name = "github.com/jesseduffield/gocui"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "432b7f6215f81ef1aaa1b2d9b69887822923cf79"

 [[projects]]
-  digest = "1:8021af4dcbd531ae89433c8c3a6520e51064114aaf8eb1724c3cf911c497c9ba"
  name = "github.com/kevinburke/ssh_config"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "9fc7bb800b555d63157c65a904c86a2cc7b4e795"
  version = "0.4"

 [[projects]]
-  digest = "1:d244f8666a838fe6ad70ec8fe77f50ebc29fdc3331a2729ba5886bef8435d10d"
  name = "github.com/magiconair/properties"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "c2353362d570a7bfa228149c62842019201cfb71"
  version = "v1.8.0"

 [[projects]]
-  digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061"
  name = "github.com/mattn/go-colorable"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
  version = "v0.0.9"

 [[projects]]
-  digest = "1:bc4f7eec3b7be8c6cb1f0af6c1e3333d5bb71072951aaaae2f05067b0803f287"
  name = "github.com/mattn/go-isatty"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
  version = "v0.0.3"

 [[projects]]
-  digest = "1:cb591533458f6eb6e2c1065ff3eac6b50263d7847deb23fc9f79b25bc608970e"
  name = "github.com/mattn/go-runewidth"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
  version = "v0.0.2"

 [[projects]]
-  digest = "1:a25c9a6b41e100f4ce164db80260f2b687095ba9d8b46a1d6072d3686cc020db"
  name = "github.com/mgutz/str"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "968bf66e3da857419e4f6e71b2d5c9ae95682dc4"
  version = "v1.2.0"

 [[projects]]
  branch = "master"
-  digest = "1:a4df73029d2c42fabcb6b41e327d2f87e685284ec03edf76921c267d9cfc9c23"
  name = "github.com/mitchellh/go-homedir"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "58046073cbffe2f25d425fe1331102f55cf719de"

 [[projects]]
  branch = "master"
-  digest = "1:5fe20cfe4ef484c237cec9f947b2a6fa90bad4b8610fd014f0e4211e13d82d5d"
  name = "github.com/mitchellh/mapstructure"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac"

 [[projects]]
-  digest = "1:2c34c77bf3ec848da26e48af58fc511ed52750961fa848399d122882b8890928"
  name = "github.com/nicksnyder/go-i18n"
  packages = [
    "v2/i18n",
    "v2/internal",
-    "v2/internal/plural",
+    "v2/internal/plural"
  ]
-  pruneopts = "NUT"
  revision = "a16b91a3ba80db3a2301c70d1d302d42251c9079"
  version = "v2.0.0-beta.5"

 [[projects]]
  branch = "master"
-  digest = "1:34d9354c2c5d916c05864327553047df59fc10e86ff1f408e4136eba0a25a5ec"
  name = "github.com/nsf/termbox-go"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"

 [[projects]]
-  digest = "1:cf254277d898b713195cc6b4a3fac8bf738b9f1121625df27843b52b267eec6c"
  name = "github.com/pelletier/go-buffruneio"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
  version = "v0.2.0"

 [[projects]]
-  digest = "1:51ea800cff51752ff68e12e04106f5887b4daec6f9356721238c28019f0b42db"
  name = "github.com/pelletier/go-toml"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
  version = "v1.2.0"

 [[projects]]
-  digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
  name = "github.com/pmezard/go-difflib"
  packages = ["difflib"]
-  pruneopts = "NUT"
  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
  version = "v1.0.0"

 [[projects]]
-  digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04"
  name = "github.com/sergi/go-diff"
  packages = ["diffmatchpatch"]
-  pruneopts = "NUT"
  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
  version = "v1.0.0"

 [[projects]]
-  branch = "master"
-  digest = "1:41618aee8828e62dfe62d44f579c06892d0e98907d1c6d5bcd83bfe8536ec5a3"
  name = "github.com/shibukawa/configdir"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"

 [[projects]]
-  digest = "1:330e9062b308ac597e28485699c02223bd052437a6eed32a173c9227dcb9d95a"
  name = "github.com/spf13/afero"
  packages = [
    ".",
-    "mem",
+    "mem"
  ]
-  pruneopts = "NUT"
  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
  version = "v1.1.1"

 [[projects]]
-  digest = "1:3fa7947ca83b98ae553590d993886e845a4bff19b7b007e869c6e0dd3b9da9cd"
  name = "github.com/spf13/cast"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "8965335b8c7107321228e3e3702cab9832751bac"
  version = "v1.2.0"

 [[projects]]
  branch = "master"
-  digest = "1:f29f83301ed096daed24a90f4af591b7560cb14b9cc3e1827abbf04db7269ab5"
  name = "github.com/spf13/jwalterweatherman"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"

 [[projects]]
-  digest = "1:e3707aeaccd2adc89eba6c062fec72116fe1fc1ba71097da85b4d8ae1668a675"
  name = "github.com/spf13/pflag"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "9a97c102cda95a86cec2345a6f09f55a939babf5"
  version = "v1.0.2"

 [[projects]]
-  digest = "1:454979540e2a1582f375a17c106cf4e11e3bcac4baffb4af23e515c87f87de13"
  name = "github.com/spf13/viper"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"
  version = "v1.1.0"

 [[projects]]
-  digest = "1:ccca1dcd18bc54e23b517a3c5babeff2e3924a7d8fc1932162225876cfe4bfb0"
+  branch = "master"
+  name = "github.com/spkg/bom"
+  packages = ["."]
+  revision = "59b7046e48ad6bac800c5e1dd5142282cbfcf154"
+
+[[projects]]
  name = "github.com/src-d/gcfg"
  packages = [
    ".",
    "scanner",
    "token",
-    "types",
+    "types"
  ]
-  pruneopts = "NUT"
  revision = "f187355171c936ac84a82793659ebb4936bc1c23"
  version = "v1.3.0"

 [[projects]]
-  digest = "1:bacb8b590716ab7c33f2277240972c9582d389593ee8d66fc10074e0508b8126"
  name = "github.com/stretchr/testify"
  packages = ["assert"]
-  pruneopts = "NUT"
  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
  version = "v1.2.2"

 [[projects]]
-  digest = "1:cd5ffc5bda4e0296ab3e4de90dbb415259c78e45e7fab13694b14cde8ab74541"
  name = "github.com/tcnksm/go-gitconfig"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "d154598bacbf4501c095a309753c5d4af66caa81"
  version = "v0.1.2"

 [[projects]]
-  digest = "1:3148cb3478c26a92b4c1a18abb9428234b281e278af6267840721a24b6cbc6a3"
  name = "github.com/xanzy/ssh-agent"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"
  version = "v0.2.0"

 [[projects]]
  branch = "master"
-  digest = "1:dfcb1b2db354cafa48fc3cdafe4905a08bec4a9757919ab07155db0ca23855b4"
  name = "golang.org/x/crypto"
  packages = [
    "cast5",
@@ -324,32 +260,26 @@
    "ssh",
    "ssh/agent",
    "ssh/knownhosts",
-    "ssh/terminal",
+    "ssh/terminal"
  ]
-  pruneopts = "NUT"
  revision = "de0752318171da717af4ce24d0a2e8626afaeb11"

 [[projects]]
  branch = "master"
-  digest = "1:76ee51c3f468493aff39dbacc401e8831fbb765104cbf613b89bef01cf4bad70"
  name = "golang.org/x/net"
  packages = ["context"]
-  pruneopts = "NUT"
  revision = "c39426892332e1bb5ec0a434a079bf82f5d30c54"

 [[projects]]
  branch = "master"
-  digest = "1:ec76a40fbfda0c329ee58f4e3b14b4279a939efce89eca020e934e2e5234eddd"
  name = "golang.org/x/sys"
  packages = [
    "unix",
-    "windows",
+    "windows"
  ]
-  pruneopts = "NUT"
  revision = "98c5dad5d1a0e8a73845ecc8897d0bd56586511d"

 [[projects]]
-  digest = "1:a95288ef1ef4dfad6cba7fe30843e1683f71bc28c912ca1ba3f6a539d44db739"
  name = "golang.org/x/text"
  packages = [
    "internal/gen",
@@ -359,28 +289,24 @@
    "language",
    "transform",
    "unicode/cldr",
-    "unicode/norm",
+    "unicode/norm"
  ]
-  pruneopts = "NUT"
  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
  version = "v0.3.0"

 [[projects]]
-  digest = "1:47a697b155f5214ff14e68e39ce9c2e8d93e1fb035ae5ba7e247d044e0ce64e3"
  name = "gopkg.in/src-d/go-billy.v4"
  packages = [
    ".",
    "helper/chroot",
    "helper/polyfill",
    "osfs",
-    "util",
+    "util"
  ]
-  pruneopts = "NUT"
  revision = "83cf655d40b15b427014d7875d10850f96edba14"
  version = "v4.2.0"

 [[projects]]
-  digest = "1:e66078da2bd6e53c72518d7f6ae0c3c8c7f34c0df12c39435ce34a6bce165525"
  name = "gopkg.in/src-d/go-git.v4"
  packages = [
    ".",
@@ -422,46 +348,25 @@
    "utils/merkletrie/filesystem",
    "utils/merkletrie/index",
    "utils/merkletrie/internal/frame",
-    "utils/merkletrie/noder",
+    "utils/merkletrie/noder"
  ]
-  pruneopts = "NUT"
  revision = "43d17e14b714665ab5bc2ecc220b6740779d733f"

 [[projects]]
-  digest = "1:b233ad4ec87ac916e7bf5e678e98a2cb9e8b52f6de6ad3e11834fc7a71b8e3bf"
  name = "gopkg.in/warnings.v0"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b"
  version = "v0.1.2"

 [[projects]]
-  digest = "1:7c95b35057a0ff2e19f707173cc1a947fa43a6eb5c4d300d196ece0334046082"
  name = "gopkg.in/yaml.v2"
  packages = ["."]
-  pruneopts = "NUT"
  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
  version = "v2.2.1"

 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  input-imports = [
-    "github.com/Sirupsen/logrus",
-    "github.com/cloudfoundry/jibber_jabber",
-    "github.com/davecgh/go-spew/spew",
-    "github.com/fatih/color",
-    "github.com/golang-collections/collections/stack",
-    "github.com/jesseduffield/gocui",
-    "github.com/mgutz/str",
-    "github.com/nicksnyder/go-i18n/v2/i18n",
-    "github.com/shibukawa/configdir",
-    "github.com/spf13/viper",
-    "github.com/stretchr/testify/assert",
-    "github.com/tcnksm/go-gitconfig",
-    "golang.org/x/text/language",
-    "gopkg.in/src-d/go-git.v4",
-    "gopkg.in/src-d/go-git.v4/plumbing",
-  ]
+  inputs-digest = "52d66c52c1720308d826a43918b77f13a47f5cc782e315cf84a8a7f7aa6baa73"
  solver-name = "gps-cdcl"
  solver-version = 1
@@ -40,3 +40,7 @@
 [[constraint]]
  name = "gopkg.in/src-d/go-git.v4"
  revision = "43d17e14b714665ab5bc2ecc220b6740779d733f"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/spkg/bom"
@@ -1,4 +1,4 @@
-# lazygit [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit)
+# lazygit [![CircleCI](https://circleci.com/gh/jesseduffield/lazygit.svg?style=svg)](https://circleci.com/gh/jesseduffield/lazygit) [![codecov](https://codecov.io/gh/jesseduffield/lazygit/branch/master/graph/badge.svg)](https://codecov.io/gh/jesseduffield/lazygit) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GoDoc](https://godoc.org/github.com/jesseduffield/lazygit?status.svg)](http://godoc.org/github.com/jesseduffield/lazygit) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)]()

 A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui "gocui") library.

@@ -37,3 +37,7 @@ The available attributes are:
 - bold
 - reverse # useful for high-contrast
 - underline
+
+## Example Coloring:
+
+![border example](/docs/resources/colored-border-example.png)
@@ -44,6 +44,7 @@
  <kbd>c</kbd>:       checkout by name
  <kbd>n</kbd>:       new branch
  <kbd>d</kbd>:       delete branch
+  <kbd>D</kbd>:       force delete branch
 </pre>

 ## Commits Panel:
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui"
@@ -51,10 +51,7 @@ func NewApp(config config.AppConfigurer) (*App, error) {
 		return app, err
 	}

-	app.Tr, err = i18n.NewLocalizer(app.Log)
-	if err != nil {
-		return app, err
-	}
+	app.Tr = i18n.NewLocalizer(app.Log)

 	app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand)
 	if err != nil {
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"strings"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	gitconfig "github.com/tcnksm/go-gitconfig"
@@ -223,8 +223,14 @@ func (c *GitCommand) NewBranch(name string) error {
 }

 // DeleteBranch delete branch
-func (c *GitCommand) DeleteBranch(branch string) error {
-	return c.OSCommand.RunCommand("git branch -d " + branch)
+func (c *GitCommand) DeleteBranch(branch string, force bool) error {
+	var command string
+	if force {
+		command = "git branch -D "
+	} else {
+		command = "git branch -d "
+	}
+	return c.OSCommand.RunCommand(command + branch)
 }

 // ListStash list stash
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/jesseduffield/lazygit/pkg/test"
 )

@@ -11,7 +11,7 @@ import (

 	"github.com/mgutz/str"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	gitconfig "github.com/tcnksm/go-gitconfig"
 )

@@ -175,7 +175,8 @@ func (c *OSCommand) Unquote(message string) string {
 	return message
 }

-func (C *OSCommand) AppendLineToFile(filename, line string) error {
+// AppendLineToFile adds a new line in file
+func (c *OSCommand) AppendLineToFile(filename, line string) error {
 	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
 	if err != nil {
 		return err
@@ -121,10 +121,7 @@ func LoadUserConfigFromFile(v *viper.Viper) error {
 		folder = configDirs.QueryFolderContainsFile("config.yml")
 	}
 	v.AddConfigPath(folder.Path)
-	if err := v.MergeInConfig(); err != nil {
-		return err
-	}
-	return nil
+	return v.MergeInConfig()
 }

 // InsertToUserConfig adds a key/value pair to the user's config and saves it
@@ -139,10 +136,7 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error {
 		return err
 	}
 	v.Set(key, value)
-	if err := v.WriteConfig(); err != nil {
-		return err
-	}
-	return nil
+	return v.WriteConfig()
 }

 func getDefaultConfig() []byte {
@@ -7,7 +7,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/utils"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"

 	"gopkg.in/src-d/go-git.v4/plumbing"
 )
@@ -62,20 +62,34 @@ func (gui *Gui) handleNewBranch(g *gocui.Gui, v *gocui.View) error {
 }

 func (gui *Gui) handleDeleteBranch(g *gocui.Gui, v *gocui.View) error {
+	return gui.deleteBranch(g, v, false)
+}
+
+func (gui *Gui) handleForceDeleteBranch(g *gocui.Gui, v *gocui.View) error {
+	return gui.deleteBranch(g, v, true)
+}
+
+func (gui *Gui) deleteBranch(g *gocui.Gui, v *gocui.View, force bool) error {
 	checkedOutBranch := gui.State.Branches[0]
 	selectedBranch := gui.getSelectedBranch(v)
 	if checkedOutBranch.Name == selectedBranch.Name {
 		return gui.createErrorPanel(g, gui.Tr.SLocalize("CantDeleteCheckOutBranch"))
 	}
+	title := gui.Tr.SLocalize("DeleteBranch")
+	var messageId string
+	if force {
+		messageId = "ForceDeleteBranchMessage"
+	} else {
+		messageId = "DeleteBranchMessage"
+	}
 	message := gui.Tr.TemplateLocalize(
-		"DeleteBranchMessage",
+		messageId,
 		Teml{
 			"selectedBranchName": selectedBranch.Name,
 		},
 	)
-	title := gui.Tr.SLocalize("DeleteBranch")
 	return gui.createConfirmationPanel(g, v, title, message, func(g *gocui.Gui, v *gocui.View) error {
-		if err := gui.GitCommand.DeleteBranch(selectedBranch.Name); err != nil {
+		if err := gui.GitCommand.DeleteBranch(selectedBranch.Name, force); err != nil {
 			return gui.createErrorPanel(g, err.Error())
 		}
 		return gui.refreshSidePanels(g)
@@ -108,6 +122,7 @@ func (gui *Gui) renderBranchesOptions(g *gocui.Gui) error {
 		"c":       gui.Tr.SLocalize("checkoutByName"),
 		"n":       gui.Tr.SLocalize("newBranch"),
 		"d":       gui.Tr.SLocalize("deleteBranch"),
+		"D":       gui.Tr.SLocalize("forceDeleteBranch"),
 		"← → ↑ ↓": gui.Tr.SLocalize("navigate"),
 	})
 }
@@ -15,7 +15,7 @@ import (

 	// "strings"

-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/golang-collections/collections/stack"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
@@ -57,6 +57,7 @@ func (gui *Gui) keybindings(g *gocui.Gui) error {
 		{ViewName: "branches", Key: 'F', Modifier: gocui.ModNone, Handler: gui.handleForceCheckout},
 		{ViewName: "branches", Key: 'n', Modifier: gocui.ModNone, Handler: gui.handleNewBranch},
 		{ViewName: "branches", Key: 'd', Modifier: gocui.ModNone, Handler: gui.handleDeleteBranch},
+		{ViewName: "branches", Key: 'D', Modifier: gocui.ModNone, Handler: gui.handleForceDeleteBranch},
 		{ViewName: "branches", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleMerge},
 		{ViewName: "commits", Key: 's', Modifier: gocui.ModNone, Handler: gui.handleCommitSquashDown},
 		{ViewName: "commits", Key: 'r', Modifier: gocui.ModNone, Handler: gui.handleRenameCommit},
@@ -7,6 +7,8 @@ import (
 	"time"

 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/spkg/bom"
 )

 var cyclableViews = []string{"status", "files", "branches", "commits", "stash"}
@@ -217,7 +219,9 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 			return nil
 		}
 		v.Clear()
-		fmt.Fprint(v, s)
+		output := string(bom.Clean([]byte(s)))
+		output = utils.NormalizeLinefeeds(output)
+		fmt.Fprint(v, output)
 		v.Wrap = true
 		return nil
 	})
@@ -132,7 +132,10 @@ func addDutch(i18nObject *i18n.Bundle) error {
 			Other: "Verwijder branch",
 		}, &i18n.Message{
 			ID:    "DeleteBranchMessage",
-			Other: "Weet je zeker dat je {{.selectedBranchName}} branch wil verwijderen?",
+			Other: "Weet je zeker dat je branch {{.selectedBranchName}} wil verwijderen?",
+		}, &i18n.Message{
+			ID:    "ForceDeleteBranchMessage",
+			Other: "Weet je zeker dat je branch {{.selectedBranchName}} geforceerd wil verwijderen?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "Je kan niet een branch in zichzelf mergen",
@@ -151,6 +154,9 @@ func addDutch(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "deleteBranch",
 			Other: "verwijder branch",
+		}, &i18n.Message{
+			ID:    "forceDeleteBranch",
+			Other: "verwijder branch (forceer)",
 		}, &i18n.Message{
 			ID:    "NoBranchesThisRepo",
 			Other: "Geen branches voor deze repo",
@@ -140,7 +140,10 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 			Other: "Delete Branch",
 		}, &i18n.Message{
 			ID:    "DeleteBranchMessage",
-			Other: "Are you sure you want delete the branch {{.selectedBranchName}} ?",
+			Other: "Are you sure you want to delete the branch {{.selectedBranchName}}?",
+		}, &i18n.Message{
+			ID:    "ForceDeleteBranchMessage",
+			Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?",
 		}, &i18n.Message{
 			ID:    "CantMergeBranchIntoItself",
 			Other: "You cannot merge a branch into itself",
@@ -159,6 +162,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "deleteBranch",
 			Other: "delete branch",
+		}, &i18n.Message{
+			ID:    "forceDeleteBranch",
+			Other: "delete branch (force)",
 		}, &i18n.Message{
 			ID:    "NoBranchesThisRepo",
 			Other: "No branches for this repo",
@@ -1,7 +1,7 @@
 package i18n

 import (
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/cloudfoundry/jibber_jabber"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"golang.org/x/text/language"
@@ -18,33 +18,12 @@ type Localizer struct {
 }

 // NewLocalizer creates a new Localizer
-func NewLocalizer(log *logrus.Logger) (*Localizer, error) {
+func NewLocalizer(log *logrus.Logger) *Localizer {
+	userLang := detectLanguage(jibber_jabber.DetectLanguage)

-	// detect the user's language
-	userLang, err := jibber_jabber.DetectLanguage()
-	if err != nil {
-		if err.Error() != "Could not detect Language" {
-			return nil, err
-		}
-		userLang = "C"
-	}
 	log.Info("language: " + userLang)

-	// create a i18n bundle that can be used to add translations and other things
-	i18nBundle := &i18n.Bundle{DefaultLanguage: language.English}
-
-	addBundles(log, i18nBundle)
-
-	// return the new localizer that can be used to translate text
-	i18nLocalizer := i18n.NewLocalizer(i18nBundle, userLang)
-
-	localizer := &Localizer{
-		i18nLocalizer: i18nLocalizer,
-		language:      userLang,
-		Log:           log,
-	}
-
-	return localizer, nil
+	return setupLocalizer(log, userLang)
 }

 // Localize handels the translations
@@ -82,17 +61,42 @@ func (l *Localizer) GetLanguage() string {

 // add translation file(s)
 func addBundles(log *logrus.Logger, i18nBundle *i18n.Bundle) {
-	err := addPolish(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = addDutch(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = addEnglish(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
+	fs := []func(*i18n.Bundle) error{
+		addPolish,
+		addDutch,
+		addEnglish,
 	}

+	for _, f := range fs {
+		if err := f(i18nBundle); err != nil {
+			log.Fatal(err)
+
+		}
+	}
+}
+
+// detectLanguage extracts user language from environment
+func detectLanguage(langDetector func() (string, error)) string {
+	if userLang, err := langDetector(); err == nil {
+		return userLang
+	}
+
+	return "C"
+}
+
+// setupLocalizer creates a new localizer using given userLang
+func setupLocalizer(log *logrus.Logger, userLang string) *Localizer {
+	// create a i18n bundle that can be used to add translations and other things
+	i18nBundle := &i18n.Bundle{DefaultLanguage: language.English}
+
+	addBundles(log, i18nBundle)
+
+	// return the new localizer that can be used to translate text
+	i18nLocalizer := i18n.NewLocalizer(i18nBundle, userLang)
+
+	return &Localizer{
+		i18nLocalizer: i18nLocalizer,
+		language:      userLang,
+		Log:           log,
+	}
 }
@@ -0,0 +1,81 @@
+package i18n
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewLocalizer(t *testing.T) {
+	assert.NotNil(t, NewLocalizer(logrus.New()))
+}
+
+func TestDetectLanguage(t *testing.T) {
+	type scenario struct {
+		langDetector func() (string, error)
+		expected     string
+	}
+
+	scenarios := []scenario{
+		{
+			func() (string, error) {
+				return "", fmt.Errorf("An error occurred")
+			},
+			"C",
+		},
+		{
+			func() (string, error) {
+				return "en", nil
+			},
+			"en",
+		},
+	}
+
+	for _, s := range scenarios {
+		assert.EqualValues(t, s.expected, detectLanguage(s.langDetector))
+	}
+}
+
+func TestLocalizer(t *testing.T) {
+	type scenario struct {
+		userLang string
+		test     func(*Localizer)
+	}
+
+	scenarios := []scenario{
+		{
+			"C",
+			func(l *Localizer) {
+				assert.EqualValues(t, "C", l.GetLanguage())
+				assert.Equal(t, "Diff", l.Localize(&i18n.LocalizeConfig{
+					DefaultMessage: &i18n.Message{
+						ID: "DiffTitle",
+					},
+				}))
+				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
+				assert.Equal(t, "Are you sure you want to delete the branch test?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+			},
+		},
+		{
+			"nl",
+			func(l *Localizer) {
+				assert.EqualValues(t, "nl", l.GetLanguage())
+				assert.Equal(t, "Diff", l.Localize(&i18n.LocalizeConfig{
+					DefaultMessage: &i18n.Message{
+						ID: "DiffTitle",
+					},
+				}))
+				assert.Equal(t, "Diff", l.SLocalize("DiffTitle"))
+				assert.Equal(t, "Weet je zeker dat je branch test wil verwijderen?", l.TemplateLocalize("DeleteBranchMessage", Teml{"selectedBranchName": "test"}))
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		s.test(setupLocalizer(logrus.New(), s.userLang))
+	}
+}
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"path/filepath"

 	"github.com/jesseduffield/lazygit/pkg/utils"
 )
@@ -11,15 +12,20 @@ import (
 // GenerateRepo generates a repo from test/repos and changes the directory to be
 // inside the newly made repo
 func GenerateRepo(filename string) error {
-	testPath := utils.GetProjectRoot() + "/test/repos/"
+	reposDir := "/test/repos/"
+	testPath := utils.GetProjectRoot() + reposDir
+
+	// workaround for debian packaging
+	if _, err := os.Stat(testPath); os.IsNotExist(err) {
+		cwd, _ := os.Getwd()
+		testPath = filepath.Dir(filepath.Dir(cwd)) + reposDir
+	}
 	if err := os.Chdir(testPath); err != nil {
 		return err
 	}
 	if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil {
 		return errors.New(string(output))
 	}
-	if err := os.Chdir(testPath + "repo"); err != nil {
-		return err
-	}
-	return nil
+
+	return os.Chdir(testPath + "repo")
 }
@@ -64,6 +64,13 @@ func TrimTrailingNewline(str string) string {
 	return str
 }

+// NormalizeLinefeeds - Removes all Windows and Mac style line feeds
+func NormalizeLinefeeds(str string) string {
+	str = strings.Replace(str, "\r\n", "\n", -1)
+	str = strings.Replace(str, "\r", "", -1)
+	return str
+}
+
 // GetProjectRoot returns the path to the root of the project. Only to be used
 // in testing contexts, as with binaries it's unlikely this path will exist on
 // the machine
@@ -81,3 +81,36 @@ func TestTrimTrailingNewline(t *testing.T) {
 		assert.EqualValues(t, s.expected, TrimTrailingNewline(s.str))
 	}
 }
+
+func TestNormalizeLinefeeds(t *testing.T) {
+	type scenario struct {
+		byteArray []byte
+		expected  []byte
+	}
+	var scenarios = []scenario{
+		{
+			// \r\n
+			[]byte{97, 115, 100, 102, 13, 10},
+			[]byte{97, 115, 100, 102, 10},
+		},
+		{
+			// bash\r\nblah
+			[]byte{97, 115, 100, 102, 13, 10, 97, 115, 100, 102},
+			[]byte{97, 115, 100, 102, 10, 97, 115, 100, 102},
+		},
+		{
+			// \r
+			[]byte{97, 115, 100, 102, 13},
+			[]byte{97, 115, 100, 102},
+		},
+		{
+			// \n
+			[]byte{97, 115, 100, 102, 10},
+			[]byte{97, 115, 100, 102, 10},
+		},
+	}
+
+	for _, s := range scenarios {
+		assert.EqualValues(t, string(s.expected), NormalizeLinefeeds(string(s.byteArray)))
+	}
+}
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+echo "" > coverage.txt
+
+for d in $( find ./* -maxdepth 10 ! -path "./vendor*" ! -path "./.git*" -type d); do
+    if ls $d/*.go &> /dev/null; then
+        go test -v -race -coverprofile=profile.out -covermode=atomic $d
+        if [ -f profile.out ]; then
+            cat profile.out >> coverage.txt
+            rm profile.out
+        fi
+    fi
+done
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -ex; rm -rf repo; mkdir repo; cd repo
+
+git init
+
+cat <<EOT >> windowslf.txt
+asdf
+asdf
+EOT
+
+cat <<EOT >> linuxlf.txt
+asdf
+asdf
+EOT
+
+cat <<EOT >> bomtest.txt
+A,B,C,D,E
+F,G,H,I,J
+K,L,M,N,O
+P,Q,R,S,T
+U,V,W,X,Y
+Z,1,2,3,4
+EOT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 John Jeffery
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -0,0 +1,39 @@
+// Package bom is used to clean up UTF-8 Byte Order Marks.
+package bom
+
+import (
+	"bufio"
+	"io"
+)
+
+const (
+	bom0 = 0xef
+	bom1 = 0xbb
+	bom2 = 0xbf
+)
+
+// Clean returns b with the 3 byte BOM stripped off the front if it is present.
+// If the BOM is not present, then b is returned.
+func Clean(b []byte) []byte {
+	if len(b) >= 3 &&
+		b[0] == bom0 &&
+		b[1] == bom1 &&
+		b[2] == bom2 {
+		return b[3:]
+	}
+	return b
+}
+
+// NewReader returns an io.Reader that will skip over initial UTF-8 byte order marks.
+func NewReader(r io.Reader) io.Reader {
+	buf := bufio.NewReader(r)
+	b, err := buf.Peek(3)
+	if err != nil {
+		// not enough bytes
+		return buf
+	}
+	if b[0] == bom0 && b[1] == bom1 && b[2] == bom2 {
+		discardBytes(buf, 3)
+	}
+	return buf
+}
@@ -0,0 +1,12 @@
+// +build !go1.5
+
+package bom
+
+import "bufio"
+
+func discardBytes(buf *bufio.Reader, n int) {
+	// cannot use the buf.Discard method as it was introduced in Go 1.5
+	for i := 0; i < n; i++ {
+		buf.ReadByte()
+	}
+}
@@ -0,0 +1,10 @@
+// +build go1.5
+
+package bom
+
+import "bufio"
+
+func discardBytes(buf *bufio.Reader, n int) {
+	// the Discard method was introduced in Go 1.5
+	buf.Discard(n)
+}
Author	SHA1	Message	Date
Jesse Duffield	22de5e7b23	Merge pull request #210 from dawidd6/sirupsen/imports Sirupsen -> sirupsen	2018-08-24 07:58:47 +10:00
Dawid Dziurla	bcbeec1a56	Sirupsen -> sirupsen	2018-08-23 14:22:03 +02:00
Jesse Duffield	2cdd439286	Merge pull request #204 from remyabel/hotfix/fix-dutch-errors Fix typos causing tests to fail	2018-08-23 10:19:31 +10:00
Tommy Nguyen	2680b2f4fe	Merge branch 'hotfix/fix-dutch-errors' of github.com:remyabel/lazygit into hotfix/fix-dutch-errors	2018-08-22 11:28:09 -04:00
Tommy Nguyen	3e8ef0d12d	Remove space before punctuation	2018-08-22 11:27:45 -04:00
remyabel	bee4d98f52	Remove space before punctuation	2018-08-21 21:27:20 -04:00
Jesse Duffield	584d6b241c	Merge pull request #198 from antham/fix-various-errors Fix various errors reported by goreportcard	2018-08-22 09:28:19 +10:00
Anthony HAMON	37681627ab	remove useless check	2018-08-21 20:54:48 +02:00
Anthony HAMON	810155ef2f	fix documentation and reference issues	2018-08-21 20:54:46 +02:00
Tommy Nguyen	924a9bb2c9	Fix typos causing tests to fail	2018-08-21 10:55:33 -04:00
Jesse Duffield	4d635cd1cd	Merge pull request #151 from alcohol/force-delete-branch add option to force delete given branch	2018-08-21 23:45:27 +10:00
Jesse Duffield	3d49ab6666	Merge pull request #202 from dawidd6/test Fix testPath for debian packaging	2018-08-21 23:33:25 +10:00
Rob Bast	182e475116	correct variable assignment	2018-08-21 12:09:13 +02:00
Rob Bast	5f6b61d28c	adjust translation(s) for forced branch deletion	2018-08-21 12:06:42 +02:00
Rob Bast	810540edfa	add return	2018-08-21 11:32:17 +02:00
Jesse Duffield	042c83387e	make bom.sh executable for easier testing	2018-08-21 17:41:18 +10:00
Jesse Duffield	c6a8899060	Merge pull request #160 from remyabel/157_remove_bom #157: clean BOM, allowing CSV files to display correctly	2018-08-21 17:39:55 +10:00
Jesse Duffield	da4c12bf9e	Merge pull request #193 from antham/add-tests Add tests to i18n package	2018-08-21 17:34:13 +10:00
Jesse Duffield	d6ee413587	Update Config.md	2018-08-21 13:42:17 +10:00
Jesse Duffield	9b63887867	add colored borders example image	2018-08-21 13:27:27 +10:00
Jesse Duffield	d35eaa062b	remove org-global context in circle ci config	2018-08-21 12:57:19 +10:00
Jesse Duffield	0c27776a83	Merge pull request #179 from antham/master Update circleci config, add badges	2018-08-21 12:49:22 +10:00
Anthony HAMON	4972a4c218	rewrite addBundles	2018-08-20 21:18:50 +02:00
Anthony HAMON	e4070ccb4f	rewrite language detection, rewrite tests	2018-08-20 21:12:42 +02:00
Dawid Dziurla	483b4d939d	fix testPath for debian packaging	2018-08-20 15:21:05 +02:00
Tommy Nguyen	45fea83771	Convert \r\n to \n; don't depend on unix2dos	2018-08-20 09:16:35 -04:00
Anthony HAMON	3c0fb9b324	add tests to i18n package	2018-08-20 09:02:57 +02:00
Rob Bast	8e3df6b981	add option to force delete given branch	2018-08-20 08:37:16 +02:00
Tommy Nguyen	5dd049eb82	Convert test to use new library	2018-08-19 23:39:57 -04:00
Tommy Nguyen	f1a4a7e1ff	synchronize deps	2018-08-19 23:34:58 -04:00
Tommy Nguyen	108815c790	Add missing brace	2018-08-19 23:31:26 -04:00
remyabel	5c65066cbb	Merge branch 'master' into 157_remove_bom	2018-08-19 23:29:47 -04:00
Anthony HAMON	bb86a3ff7c	update github template	2018-08-19 20:21:19 +02:00
Anthony HAMON	bbf7a9d790	add various badges * golangci (https://golangci.com) * circleci (https://circleci.com/) * codecov.io (https://codecov.io) * godoc * tag release	2018-08-19 20:21:19 +02:00
Anthony HAMON	fbfa48f0fc	update circleci * define release worflow when a tag is created * add dep install * run tests with coverage * add goreleaser	2018-08-19 20:21:14 +02:00
Tommy Nguyen	e8b12a086c	Fix ineffectual assignment	2018-08-19 08:52:08 -04:00
Tommy Nguyen	766197de9d	NormalizeLinefeeds removes rather than converts Window/Mac style lf's	2018-08-19 08:48:03 -04:00
Tommy Nguyen	d2bdac29aa	Merge branch 'master' into 157_remove_bom	2018-08-19 07:22:48 -04:00
Tommy Nguyen	cea736e6e9	Factor out into NormalizeLinefeeds; add tests	2018-08-19 07:20:50 -04:00
Tommy Nguyen	b46d174f70	view_helpers.go: don't ignore return value	2018-08-19 02:21:33 -04:00
Tommy Nguyen	cdc6d45fa4	view_helpers.go: replace \r with \r\n	2018-08-19 02:19:19 -04:00
Tommy Nguyen	018b43163c	synchronize deps	2018-08-18 02:20:10 -04:00
remyabel	9a923eb300	Merge branch 'master' into 157_remove_bom	2018-08-18 02:11:13 -04:00
remyabel	64d8a55dbd	Merge branch 'master' into 157_remove_bom	2018-08-16 07:59:31 -04:00
Tommy Nguyen	74d81ae080	[rebase] Fix errors; update dependencies Argument must be []byte not string Don't commit bomtest.txt	2018-08-16 07:17:47 -04:00
Tommy Nguyen	3a31b84d1a	add BOM test generator	2018-08-16 02:00:34 -04:00
Tommy Nguyen	f09515867d	#157 : clean BOM, allowing CSV files to display correctly	2018-08-16 01:53:53 -04:00