Remove redundant semicolon

Will be integrated with another

.circleci/config.yml

@@ -1,62 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/golang:1.14
-    environment:
-      GO111MODULE: "on"
-    working_directory: /go/src/github.com/jesseduffield/lazygit
-    steps:
-      - checkout
-      - run:
-          name: Run gofmt -s
-          command: |
-            if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
-             find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
-             exit 1;
-            fi
-      - restore_cache:
-          keys:
-            - pkg-cache-{{ checksum "go.sum" }}-v5
-      - run:
-          name: Run tests
-          command: |
-            ./test.sh
-      - run:
-          name: Push on codecov result
-          command: |
-            bash <(curl -s https://codecov.io/bash)
-      - run:
-          name: Compile project on every platform
-          command: |
-            go get github.com/mitchellh/gox
-            GOFLAGS=-mod=vendor gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"
-      - save_cache:
-          key: pkg-cache-{{ checksum "go.sum" }}-v5
-          paths:
-            - ~/.cache/go-build
-
-  release:
-    docker:
-      - image: circleci/golang:1.14
-    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: /.*/

.github/workflows/cd.yml

@@ -0,0 +1,34 @@
+name: Continuous Delivery
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14.x
+      - name: Run goreleaser
+        uses: goreleaser/goreleaser-action@v1
+        with:
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
+      - name: Get tag
+        id: tag
+        run: echo "::set-output name=tag::${GITHUB_REF##*/}"
+      - name: Bump Homebrew
+        uses: dawidd6/action-homebrew-bump-formula@v1
+        with:
+          token: ${{secrets.GITHUB_API_TOKEN}}
+          formula: lazygit
+          url: "https://github.com/${{github.repository}}/archive/${{steps.tag.outputs.tag}}.tar.gz"

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: Continuous Integration
+
+on: push
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    env:
+      GOFLAGS: -mod=vendor
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/go-build
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Format code
+        run: |
+          if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
+           find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
+           exit 1
+          fi
+      - name: Test code
+        run: |
+          ./test.sh
+      - name: Build binaries
+        run: |
+          go get github.com/mitchellh/gox
+          export PATH="$(go env GOPATH)/bin:$PATH"
+          gox -parallel 4 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"

.github/workflows/homebrew.yml

@@ -1,20 +0,0 @@
-name: Bump Homebrew formula
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get tag
-        id: tag
-        run: echo "::set-output name=tag::${GITHUB_REF##*/}"
-      - name: Bump Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v1.1.0
-        with:
-          token: ${{secrets.GITHUB_API_TOKEN}}
-          formula: lazygit
-          url: "https://github.com/${{github.repository}}/archive/${{steps.tag.outputs.tag}}.tar.gz"

README.md

@@ -1,4 +1,4 @@
-# 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)]() [![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/jesseduffield/lazygit)](https://www.tickgit.com/browse?repo=github.com/jesseduffield/lazygit)
+# lazygit ![CI](https://github.com/jesseduffield/lazygit/workflows/Continuous%20Integration/badge.svg) [![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)]() [![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/jesseduffield/lazygit)](https://www.tickgit.com/browse?repo=github.com/jesseduffield/lazygit)
 
 A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui 'gocui') library.
 

docs/Config.md

@@ -128,6 +128,7 @@ Default path for the config file:
       tagCommit: 'T'
       toggleDiffCommit: 'i'
       checkoutCommit: '<space>'
+      resetCherryPick: '<c-R>'
     stash:
       popStash: 'g'
     commitFiles:

pkg/config/app_config.go

@@ -360,6 +360,7 @@ keybinding:
     tagCommit: 'T'
     toggleDiffCommit: 'i'
     checkoutCommit: '<space>'
+    resetCherryPick: '<c-R>'
   stash:
     popStash: 'g'
   commitFiles:

pkg/gui/commits_panel.go

@@ -642,3 +642,8 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
 
 	return gui.handleOpenSearch(gui.g, v)
 }
+
+func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error {
+	gui.State.CherryPickedCommits = []*commands.Commit{}
+	return gui.refreshCommits(gui.g)
+}

pkg/gui/gui.go

@@ -213,6 +213,7 @@ type guiState struct {
 	Ptmx                 *os.File
 	PrevMainWidth        int
 	PrevMainHeight       int
+	OldInformation       string
 }
 
 // for now the split view will always be on
@@ -494,6 +495,9 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
 		information = donate + " " + information
 	}
+	if len(gui.State.CherryPickedCommits) > 0 {
+		information = utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.CherryPickedCommits)), color.FgCyan)
+	}
 
 	minimumHeight := 9
 	minimumWidth := 10
@@ -760,13 +764,14 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}
 
-	if v, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0); err != nil {
+	informationView, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0)
+	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		v.BgColor = gocui.ColorDefault
-		v.FgColor = gocui.ColorGreen
-		v.Frame = false
+		informationView.BgColor = gocui.ColorDefault
+		informationView.FgColor = gocui.ColorGreen
+		informationView.Frame = false
 		gui.renderString(g, "information", information)
 
 		// doing this here because it'll only happen once
@@ -774,6 +779,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 	}
+	if gui.State.OldInformation != information {
+		gui.setViewContent(g, informationView, information)
+		gui.State.OldInformation = information
+	}
 
 	if gui.g.CurrentView() == nil {
 		if _, err := gui.g.SetCurrentView(gui.getFilesView().Name()); err != nil {

pkg/gui/keybindings.go

@@ -840,6 +840,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleTagCommit,
 			Description: gui.Tr.SLocalize("tagCommit"),
 		},
+		{
+			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
+			Key:         gui.getKey("commits.resetCherryPick"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleResetCherryPick,
+			Description: gui.Tr.SLocalize("resetCherryPick"),
+		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{"reflog-commits"},

pkg/i18n/english.go

@@ -1032,6 +1032,9 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "closeMenu",
 			Other: "close menu",
+		}, &i18n.Message{
+			ID:    "resetCherryPick",
+			Other: "reset cherry-picked (copied) commits selection",
 		},
 	)
 }