Merge branch 'master' of https://github.com/jesseduffield/lazygit

Precise supported ubuntu releases by ppa

.goreleaser.yml

@@ -1,19 +1,17 @@
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
 builds:
-  -
-    env:
-      - CGO_ENABLED=0
-    main: ./...
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm
-      - arm64
+- env:
+  - CGO_ENABLED=0
+  goos:
+    - freebsd
+    - windows
+    - darwin
+    - linux
+  goarch:
+    - amd64
+    - arm
+    - arm64
 archive:
   replacements:
     darwin: Darwin
@@ -31,5 +29,26 @@ changelog:
     exclude:
     - '^docs:'
     - '^test:'
-env_files:
-  github_token: ./github_token
+brew:
+  # Reporitory to push the tap to.
+  github:
+    owner: jesseduffield
+    name: homebrew-lazygit
+
+  # Your app's homepage.
+  # Default is empty.
+  homepage: "https://github.com/jesseduffield/lazygit/"
+
+  # Your app's description.
+  # Default is empty.
+  description: "A simple terminal UI for git commands, written in Go"
+
+  # # Packages your package depends on.
+  # dependencies:
+  #   - git
+  #   - zsh
+
+  # # Packages that conflict with your package.
+  # conflicts:
+  #   - svn
+  #   - bash

README.md

@@ -12,9 +12,6 @@ Are YOU tired of typing every git command directly into the terminal, but you're
 
 ### Via binary release
 You can download a binary release [here](https://github.com/jesseduffield/lazygit/releases)
-You may need to grant execute permission via `chmod +x ./<filename>`.
-You can move this file to your local /bin directory and rename to `lazygit` so that you can run it anywhere
-(Easier-install coming soon)
 
 ### Via Go
 In a terminal call this command:
@@ -25,7 +22,7 @@ Please note:
 If you get an error claiming that lazygit cannot be found or is not defined, you may need to add `~/go/bin` to your $PATH (MacOS/Linux), or `%HOME%\go\bin` (Windows). Not to be mistaked for `C:\Go\bin` (which is for Go's own binaries, not apps like Lazygit)
 
 ### Ubuntu
-Packages for Ubuntu 16.04 and up are available via Launchpad PPA.
+Packages for Ubuntu 16.04, 18.04 and 18.10 are available via Launchpad PPA.
 
 They are built daily, straight from master branch.
 
@@ -40,6 +37,7 @@ sudo apt-get install lazygit
 Call `lazygit` in your terminal inside a git repository.
 If you want, you can also add an alias for this with `echo "alias lg='lazygit'" >> ~/.zshrc` (or whichever rc file you're using).
 Basic tutorial [Here](https://www.youtube.com/watch?v=VDXvbHZYeKY)
+
 [Keybindings](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md)
 
 ## Cool features

files_panel.go

@@ -74,6 +74,9 @@ func handleAddPatch(g *gocui.Gui, v *gocui.View) error {
 	if !file.HasUnstagedChanges {
 		return createErrorPanel(g, "File has no unstaged changes to add")
 	}
+	if !file.Tracked {
+		return createErrorPanel(g, "Cannot git add --patch untracked files")
+	}
 	gitAddPatch(g, file.Name)
 	return err
 }

gitcommands.go

@@ -306,7 +306,7 @@ func getOpenCommand() (string, string, error) {
 }
 
 func gitAddPatch(g *gocui.Gui, filename string) {
-	runSubProcess(g, "git", "add", "-p", filename)
+	runSubProcess(g, "git", "add", "--patch", filename)
 }
 
 func editFile(g *gocui.Gui, filename string) (string, error) {

github_token

@@ -1 +0,0 @@
-TnB8I+swjicHuGTXk3ncm1Aaa12eIJqWV/Lhcnbb01i39p6+fyn3vDMdWPcejt3R8gcJqv4wyP8UQVO9G1qkLppt6V/qAuY5x6nX0MgEa3t+8JLJnGYHZYsuIgan/ecAmeu5+6dgUhr9Oq6zQOEv/O88NsALzMlqnEQNXI8XSoScfhkiVDIp3zWov0vBizCdThnNgTx9zRpJVoqxmhWvgt+me2+fOhSx1Y+3ZA2gE7zq8IFAbxp36d0rsR5lKqmTuF+YsF9iQ7Ar+xCjbRunLsZx+VwGqGfpS/qS7EwsEqBI0vEO76eFJkwEsIzOvJiFNhBDUu3upquBFMT4uzxRxH3eV+J4mZtu29UDLdvKI5Q730Lk9AgmH4now+RmP08M0SEXJa+AnHeuBv2u1iU5bu+sI6CORVQzKQwOph9AABDjSZ54wrXIpYEeIW2sz8nx+hiG6QL1mqfM/l+55BR69u3vxKYMryQBxPuzhZCTOqqI4uahlb6GIUNZJ9vGZeIA9HFJq3ymW8cdrpYzhKf3Nx9jK+Yb81h5/AHq9iChXEC63VPCDXXGRllh2UYWNYCaAdtk+ekpLR8299e4CaEregy6g5U2S3/xrBKl87miu1uJ/fquXoxGdSU+JcmsmXZ26sGIU2TCYdNjSfIgpOyfMmB4JNtKHqWRHA9Fe42CRpA=