1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-28 09:08:41 +02:00
simple terminal UI for git commands
Go to file
Jesse Duffield 6e6fe6a489
Show a friendly error message when starting lazygit from a non-existent cwd (#3192)
Closes #3187

- **PR Description**

#3187 observes that lazygit crashes with a stack trace if it's run from
a non-existent current working directory. The steps to reproduce are:

```
mkdir test
cd test
rm -r ../test
lazygit
```

(Note: I can repro this on Ubuntu, but not on macOS Sonoma, where
lazygit starts regardless of whether the current working directory
exists or not.)

Here's how the repro steps look on Ubuntu with this PR applied:

```
simon@ubuntu:/Users/simon/src/3p/lazygit$ go build .
simon@ubuntu:/Users/simon/src/3p/lazygit$ mkdir deleteme
simon@ubuntu:/Users/simon/src/3p/lazygit$ cd deleteme/
simon@ubuntu:/Users/simon/src/3p/lazygit/deleteme$ rm -r ../deleteme
simon@ubuntu:/Users/simon/src/3p/lazygit/deleteme$ ../lazygit
2024/01/02 18:40:15 Error: the current working directory does not exist
```

- **Please check if the PR fulfills these requirements**

* [x] Cheatsheets are up-to-date (run `go generate ./...`)
* [x] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [x] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [x] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [x] Docs (specifically `docs/Config.md`) have been updated if
necessary
* [x] You've read through your own file changes for silly mistakes etc

<!--
Be sure to name your PR with an imperative e.g. 'Add worktrees view'
see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for
examples
-->
2024-01-09 20:54:50 +11:00
.devcontainer set default branch in dev container for the sake of integration tests 2022-11-13 03:00:58 +00:00
.github Add coverage arg for integration tests 2023-11-30 12:58:41 +11:00
.vscode add gofumpt to workspace settings 2023-09-30 19:46:03 +10:00
cmd/integration_test Support -race arg when running integration tests to turn on go's race detector 2023-09-25 09:09:41 +02:00
demo Use nerdfont version 3 2023-08-07 21:19:10 +10:00
docs Add a sort order menu for local branches 2023-12-27 15:25:29 +01:00
pkg Update error message 2024-01-02 18:43:39 +00:00
schema Implement a sort order menu for remote branches 2023-12-22 16:30:20 +09:00
scripts Add coverage arg for integration tests 2023-11-30 12:58:41 +11:00
test Add explosion animation when nuking working tree 2023-08-01 22:16:04 +10:00
vendor Bump gocui 2023-12-09 15:23:40 +01:00
.gitignore Add coverage arg for integration tests 2023-11-30 12:58:41 +11:00
.golangci.yml Ignore deprecation checks in linter 2023-09-30 19:24:59 +10:00
.goreleaser.yml Fix goreleaser 2023-07-21 09:03:47 +10:00
CODE-OF-CONDUCT.md the gods will judge me 2022-01-18 21:42:23 +11:00
CONTRIBUTING.md Advise against raising pull requests from master branch 2023-10-18 21:21:50 +11:00
Dockerfile Remove secureexec package 2023-07-30 19:59:51 +10:00
go.mod Bump gocui 2023-12-09 15:23:40 +01:00
go.sum Bump gocui 2023-12-09 15:23:40 +01:00
LICENSE Create LICENSE 2018-08-05 12:32:37 +10:00
main.go refactor to ensure code doesn't depend on integration code 2022-08-13 13:56:50 +10:00
Makefile Change Makefile to build non-optimized 2023-09-30 10:50:32 +02:00
README.md Updated README.md 2023-12-27 10:24:12 +00:00

A simple terminal UI for git commands

GitHub Releases Go Report Card Codacy Badge Codacy Badge GolangCI GitHub tag homebrew

commit_and_push

Sponsors

Maintenance of this project is made possible by all the contributors and sponsors. If you'd like to sponsor this project and have your avatar or company logo appear below click here. 💙

Mark LussierDean HerbertPeter BjorklundReilly WoodOliver GüntherPawan DhananjayBartłomiej DachDavid KarlssonJesperCarsten GehlingCEUKAkos PutzXeteraHolden LucasCaleb UkleChau TranmatejciktheAverageDev (Luca Tumedei)Zach FullerIvan ZaitsevNicholas CloudLightQuantumAliaksandr StelmachonakBurgy BenjaminJoe KlemmerAimi FadhilTobias LütkeBen BeaumontHollyJames SantucciJeff ForcierMaciej T. NowakMichael HuggettFarzad MajidfayyazYuryAndreas KurthBraden SteffaniakJordan GillardSebastianGeorge SpanosBen HuntAlex BradnerFrantisek StankoRobert Clancy (Robbo)Andy SlezakMartin KockChristian RackersederMichal KolasinskiIllarion KoperskiJesse AlamaCodacyBrettJan HeijmansKevin Nowaldsem pruijsEmil SierżęgaBen BernardOmar Luq Max BlazejewskiTony VitonisPrzemysław Szelenberger

Elevator Pitch

Rant time: You've heard it before, git is powerful, but what good is that power when everything is so damn hard to do? Interactive rebasing requires you to edit a goddamn TODO file in your editor? Are you kidding me? To stage part of a file you need to use a command line program to step through each hunk and if a hunk can't be split down any further but contains code you don't want to stage, you have to edit an arcane patch file by hand? Are you KIDDING me?! Sometimes you get asked to stash your changes when switching branches only to realise that after you switch and unstash that there weren't even any conflicts and it would have been fine to just checkout the branch directly? YOU HAVE GOT TO BE KIDDING ME!

If you're a mere mortal like me and you're tired of hearing how powerful git is when in your daily life it's a powerful pain in your ass, lazygit might be for you.

Table of contents

Lazygit is not my fulltime job but it is a hefty part time job so if you want to support the project please consider sponsoring me

Features

Stage individual lines

Press space on the selected line to stage it, or press v to start selecting a range of lines. You can also press a to select the entirety of the current hunk.

stage_lines

Interactive Rebase

Press e on a commit to start an interactive rebase on it: causing all above commits to become part of the TODO file. Then squash (s), fixup (f), drop (d), edit (e), move up (ctrl+i) or move down (ctrl+j) any of TODO commits, before continuing the rebase by bringing up the rebase options menu with m and then selecting continue. You can also perform any these actions as a once-off (e.g. pressing s on a commit to squash it) without explicitly starting a rebase.

interactive_rebase

Cherry-pick

Press c on a commit to copy it and press v to paste (cherry-pick) it.

cherry_pick

Bisect

Press b in the commits view to mark a commit as good/bad in order to begin a git bisect.

bisect

Nuke the working tree

For when you really want to just get rid of anything that shows up when you run git status (and yes that includes dirty submodules) kidpix style, press shift+d to bring up the reset options menu and then select the 'nuke' option.

Nuke working tree

Amend an old commit

Pressing shift+a on any commit will amend that commit with the currently staged changes (running an interactive rebase in the background).

amend_old_commit

Filter

You can filter a view with /. Here we filter down our branches view and then hit enter to view its commits.

filter

Invoke a custom command

Lazygit has a very flexible custom command system. In this example a custom command is defined which emulates the built-in branch checkout action.

custom_command

Worktrees

You can create worktrees to have multiple branches going at once without the need for stashing or creating WIP commits when switching between them. Press w in the branches view to create a worktree from the selected branch and switch to it.

worktree_create_from_branches

Rebase magic (custom patches)

You can build a custom patch from an old commit and then remove the patch from the commit, split out a new commit, apply the patch in reverse to the index, and more.

In this example we have a redundant comment that we want to remove from an old commit. We hit <enter> on the commit to view its files, then <enter> on a file to focus the patch, then <space> to add the comment line to our custom patch, and then ctrl+p to view the custom patch options; selecting to remove the patch from the current commit.

Learn more in the Rebase magic Youtube tutorial.

custom_patch

Rebase from marked base commit

Say you're on a feature branch that was itself branched off of the develop branch, and you've decided you'd rather be branching off the master branch. You need a way to rebase only the commits from your feature branch. In this demo we check to see which was the last commit on the develop branch, then press shift+b to mark that commit as our base commit, then press r on the master branch to rebase onto it, only bringing across the commits from our feature branch. Then we push our changes with shift+p.

rebase_onto

Undo

You can undo the last action by pressing 'z' and redo with ctrl+z. Here we drop a couple of commits and then undo the actions. Undo uses the reflog which is specific to commits and branches so we can't undo changes to the working tree or stash.

More info

undo

Commit graph

When viewing the commit graph in an enlarged window (use + and _ to cycle window sizes), the commit graph is shown. Colours correspond to the commit authors, and as you navigate down the graph, the parent commits of the selected commit are highlighted.

commit_graph

Compare two commits

If you press shift+w on a commit (or branch/ref) a menu will open that allows you to mark that commit so that any other commit you select will be diffed against it. Once you've selected the second commit, you'll see the diff in the main view and if you press <enter> you'll see the files of the diff. You can press shift+w to view the diff menu again to see options like reversing the diff direction or exiting diff mode. You can also exit diff mode by pressing <escape>.

diff_commits

Tutorials

Installation

Packaging status

Most of the above packages are maintained by third parties so be sure to vet them yourself and confirm that the maintainer is a trustworthy looking person who attends local sports games and gives back to their communities with barbeque fundraisers etc

Binary Releases

For Windows, Mac OS(10.12+) or Linux, you can download a binary release here.

Homebrew

Normally the lazygit formula can be found in the Homebrew core but we suggest you tap our formula to get the frequently updated one. It works with Linux, too.

Tap:

brew install jesseduffield/lazygit/lazygit

Core:

brew install lazygit

MacPorts

Latest version built from github releases. Tap:

sudo port install lazygit

Void Linux

Packages for Void Linux are available in the distro repo

They follow upstream latest releases

sudo xbps-install -S lazygit

Scoop (Windows)

You can install lazygit using scoop. It's in the extras bucket:

# Add the extras bucket
scoop bucket add extras

# Install lazygit
scoop install lazygit

Arch Linux

Packages for Arch Linux are available via pacman and AUR (Arch User Repository).

There are two packages. The stable one which is built with the latest release and the git version which builds from the most recent commit.

Instruction of how to install AUR content can be found here: https://wiki.archlinux.org/index.php/Arch_User_Repository

Fedora and RHEL

Packages for Fedora/RHEL and CentOS Stream are available via Copr (Cool Other Package Repo).

sudo dnf copr enable atim/lazygit -y
sudo dnf install lazygit

Solus Linux

sudo eopkg install lazygit

Ubuntu

LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz"
tar xf lazygit.tar.gz lazygit
sudo install lazygit /usr/local/bin

Verify the correct installation of lazygit:

lazygit --version

Funtoo Linux

Funtoo Linux has an autogenerated lazygit package in dev-kit:

sudo emerge dev-vcs/lazygit

Gentoo Linux

Lazygit is not (yet) in main Gentoo portage, however an ebuild is available in GURU overlay

You can either add the overlay to your system and install lazygit as usual:

sudo eselect repository enable guru
sudo emaint sync -r guru
sudo emerge dev-vcs/lazygit

openSUSE

The lazygit package is currently built in devel:languages:go/lazygit.

To install lazygit on openSUSE Tumbleweed run:

sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Factory/devel:languages:go.repo
sudo zypper ref && sudo zypper in lazygit

To install lazygit on openSUSE Leap run:

source /etc/os-release
sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/go/$VERSION_ID/devel:languages:go.repo
sudo zypper ref && sudo zypper in lazygit

FreeBSD

pkg install lazygit

Termux

apt install lazygit

Conda

Released versions are available for different platforms, see https://anaconda.org/conda-forge/lazygit

conda install -c conda-forge lazygit

Go

go install github.com/jesseduffield/lazygit@latest

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 mistaken for C:\Go\bin (which is for Go's own binaries, not apps like lazygit).

Chocolatey (Windows)

You can install lazygit using Chocolatey:

choco install lazygit

Winget (Windows 10 1709 or later)

You can install lazygit using the winget command in the Windows Terminal with the following command:

winget install -e --id=JesseDuffield.lazygit

Manual

You'll need to install Go

git clone https://github.com/jesseduffield/lazygit.git
cd lazygit
go install

You can also use go run main.go to compile and run in one go (pun definitely intended)

Usage

Call lazygit in your terminal inside a git repository.

$ lazygit

If you want, you can also add an alias for this with echo "alias lg='lazygit'" >> ~/.zshrc (or whichever rc file you're using).

Keybindings

You can check out the list of keybindings here.

Changing Directory On Exit

If you change repos in lazygit and want your shell to change directory into that repo on exiting lazygit, add this to your ~/.zshrc (or other rc file):

lg()
{
    export LAZYGIT_NEW_DIR_FILE=~/.lazygit/newdir

    lazygit "$@"

    if [ -f $LAZYGIT_NEW_DIR_FILE ]; then
            cd "$(cat $LAZYGIT_NEW_DIR_FILE)"
            rm -f $LAZYGIT_NEW_DIR_FILE > /dev/null
    fi
}

Then source ~/.zshrc and from now on when you call lg and exit you'll switch directories to whatever you were in inside lazygit. To override this behaviour you can exit using shift+Q rather than just q.

Undo/Redo

See the docs

Configuration

Check out the configuration docs.

Custom Pagers

See the docs

Custom Commands

If lazygit is missing a feature, there's a good chance you can implement it yourself with a custom command!

See the docs

Git flow support

Lazygit supports Gitflow if you have it installed. To understand how the Gitflow model works check out Vincent Driessen's original post explaining it. To view Gitflow options from within Lazygit, press i from within the branches view.

Contributing

We love your input! Please check out the contributing guide. For contributor discussion about things not better discussed here in the repo, join the discord channel

Check out this video walking through the creation of a small feature in lazygit if you want an idea of where to get started.

Debugging Locally

Run lazygit --debug in one terminal tab and lazygit --logs in another to view the program and its log output side by side

Donate

If you would like to support the development of lazygit, consider sponsoring me (github is matching all donations dollar-for-dollar for 12 months)

FAQ

What do the commit colors represent?

  • Green: the commit is included in the master branch
  • Yellow: the commit is not included in the master branch
  • Red: the commit has not been pushed to the upstream branch

Shameless Plug

If you want to see what I (Jesse) am up to in terms of development, follow me on twitter or check out my blog

Alternatives

If you find that lazygit doesn't quite satisfy your requirements, these may be a better fit: