From: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
To: "Thomas Lowry" <thomas@bit-artificer.com>
Cc: git@vger.kernel.org
Subject: Re: Expanded worktree tooling?
Date: Fri, 15 Mar 2024 20:12:54 +0100 [thread overview]
Message-ID: <028f7834-7695-4702-ada3-7fe74e8cbea7@app.fastmail.com> (raw)
In-Reply-To: <CZU56XWOUT4P.1WZ2BSE0VLN01@bit-artificer.com>
Hello
On Fri, Mar 15, 2024, at 08:23, Thomas Lowry wrote:
> - throwaway/temp workspaces
> One use case that I've seen alot is creating a workspace to handle
> some hotfix and/or debugging and possibly commit the fix. Instead of
> needing to actively manage this workspace (mostly the cleanup) I
> imagine it would not be too dificult to these in the /tmp folder and
> then cleanup/ignore their entries. Temp workspace file paths might
> make this kind of tooling pointless unless you also automatically
> change the working directory to the new workspace.. I've seen people
> advocate for a git aliases that jump between workspaces but if your
> adding the workspace and typing out the file path anyways then
> `cd path` is shorter than an alias anyways.
> - move hunks between workspaces
> In my experience it's more common for a hotfix/debugging use case to
> get the report and just use the current branch since it's not often
> that your current branch is either completely broken or directly
> conflicts with the reported bug. I usually don't stashing and changing
> branches until I've got a fix and want to commit it. I recently tried
> a workspace for this situation but I ended needing to retype the fix
> in the new workspace, after reflecting a bit I should be able to do
> `git stash -p` in the main workspace then `git stash pop` in the new
> worktree but a dedicated way to move hunks would be quite useful.
For these two I use branches and commits. Like a WIP commit similar to
stashing if I want to get the changes out of the way quickly. I don’t
use worktrees for this.[1]
I really like worktrees. I might use them for two very different
versions of the app. so that Intellij and other tools won’t get all
confused about their build state and indexing. Or a dedicated “deploy”
worktree for deploying the app with Docker (so that I can do whatever
else in the main worktree while it builds). There are a lot of
use-cases. And for the hotfix scenario: I might use a worktree when I
have to both commit some hotfixes and deploy them so that I can have a
dedicated scratchpad for that while I work on other things. (But also
not too much: too much multitasking is bad for me.)
But I don’t see how worktrees enter into the picture in these specific
outlined scenarios for me. In particular I don’t understand moving hunks
between worktrees. Moving uncommitted hunks like that seems like a
version control layer on top of the Git database, like an extra step.
† 1: My git-stash(1) bias: I don’t use it unless I am going to pop
within the next half a minute. Mostly when I have an unintented dirty
worktree in the middle of an interactive rebase.
Kristoffer
next prev parent reply other threads:[~2024-03-15 19:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-15 7:23 Expanded worktree tooling? Thomas Lowry
2024-03-15 19:12 ` Kristoffer Haugsbakk [this message]
2024-04-02 7:03 ` Thomas Lowry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=028f7834-7695-4702-ada3-7fe74e8cbea7@app.fastmail.com \
--to=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=thomas@bit-artificer.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).