5 ms·

I've started using worktrees recently and I have nothing but praise for it. It's especially useful to me because I work on multiple features and want to reduce

I've started using worktrees recently and I have nothing but praise for it. It's especially useful to me because I work on multiple features and want to reduce friction from context switching. I basically have a structure like `/worktrees/<project>/<worktree>`. I use it alongside direnv and have my .envrc in the top-level project. That essentially allows me to set up project-specific environments for all of my worktrees. This works neatly with emacs projectile mode and lets me switch between different projects/features seamlessly. My head feels a lot lighter not having to worry about my git branch state, stashing changes, and all that jazz. I think it's a great tool to have in your repertoire and to use depending on your needs.

lathiat 3y ago
I do that to but for the many stable branches of OpenStack/Ceph/etc that I’m working on at once (working on the distro/backporting side often back porting patches 3-8 releases). It’s great.
CuriousCosmic 3y ago
this is what I do as well but my structure is `~/git/<project>/<worktree>` for the worktrees and a bare git repo is stored in `~/git/<project>/.git`. The workflow I do is 1. git clone https://path.to/repo.git https://path.to/repo.git 2. mv repo/.git repo.git && rm -rf ./repo && mkdir repo && mv repo.git repo/.git && cd repo 3. git config --bool core.bare true Now you can just create worktrees in the root of the git repo. This has the advantage that the `~/git/<project>` directory is still understood as root of the git repo and the worktrees are never checked out inside the working tree directory.
- vaibhavsagar 3y ago
  Why not `git clone --bare`?
  - v7engine 3y ago
    I've tried this and it seems to be working fine. git clone --bare https://path.to/repo.git https://path.to/repo.git mv repo.git .git now we can create worktrees in the same folder.
    - CuriousCosmic 3y ago
      fwiw you can actually one line that > git clone --bare https://path.to/repo.git https://path.to/repo.git .git
  - CuriousCosmic 3y ago
    You can bare clone and it works fine. This is in part just habit from converting existing repos into bare + worktree repos.
yjftsjthsd-h 3y ago
The only problem I've ever had with work trees is my own lack of discipline; even with one directory per branch I seem to switch branches within each checkout without thinking and so make me life needlessly hard>:( Perhaps I should write a shell function to outright disallow switching branches...

lathiat 3y ago

I do that to but for the many stable branches of OpenStack/Ceph/etc that I’m working on at once (working on the distro/backporting side often back porting patches 3-8 releases). It’s great.

CuriousCosmic 3y ago

this is what I do as well but my structure is `~/git/<project>/<worktree>` for the worktrees and a bare git repo is stored in `~/git/<project>/.git`. The workflow I do is 1. git clone https://path.to/repo.git https://path.to/repo.git 2. mv repo/.git repo.git && rm -rf ./repo && mkdir repo && mv repo.git repo/.git && cd repo 3. git config --bool core.bare true Now you can just create worktrees in the root of the git repo. This has the advantage that the `~/git/<project>` directory is still understood as root of the git repo and the worktrees are never checked out inside the working tree directory.

vaibhavsagar 3y ago
Why not `git clone --bare`?
- v7engine 3y ago
  I've tried this and it seems to be working fine. git clone --bare https://path.to/repo.git https://path.to/repo.git mv repo.git .git now we can create worktrees in the same folder.
  - CuriousCosmic 3y ago
    fwiw you can actually one line that > git clone --bare https://path.to/repo.git https://path.to/repo.git .git
- CuriousCosmic 3y ago
  You can bare clone and it works fine. This is in part just habit from converting existing repos into bare + worktree repos.

yjftsjthsd-h 3y ago

The only problem I've ever had with work trees is my own lack of discipline; even with one directory per branch I seem to switch branches within each checkout without thinking and so make me life needlessly hard>:( Perhaps I should write a shell function to outright disallow switching branches...