Worktree aliases #104

dabrown645 · 2023-10-18T23:27:36Z

I have started using worktrees on my projects and put together some basic aliases for entering worktree subcommands so I thought I would contribute them to this package.

I noticed after initial push that README.md didn't have my updates and doc/index.md did so this adds link for README.md to doc/index.md along with the other changes.

I noticed after pushing up to github the README.md didn't have my updates so I linked to doc/index.md so there is only one source of truth

joelparkerhenderson · 2023-10-19T03:56:34Z

Great, thank you! Worktree is a super command for easy experimentation.

A few questions for you...

I see wtd says "remove". Did you mean to create wtr meaning r instead of d? Or did you mean for the help text to say "delete" or "drop" instead of "remove"?
What do you think about wtl for "list" (not "lock") because "list" is so common, and "lock" is typically not common? This is akin to git l for list, rather than git ls.
What do you think about more? Such as wtlp for "worktree list --porcelin", and wtlv for "worktree list --verbose"?
In an ideal setup you're correct about README.md commit. But there's a Chesterton's Fence problem. Git handles symlinks differently per version and depending on helper tools. For the time being, there need to be two sources of truth. Or possibly a precommit hook that copies one to the other and rewrites the links.

If you would like to fix up your merge request, that's great. Pull rebase (because there's a fix that came it just today for a bunch of quotations), then push any of the changes you want to do above. Or if you prefer to have me to do it, that's fine too; I'm so grateful for your code.

Thank you so much, again, for all your additions. These will be really useful for many people and teams. And I especially appreciate that your doing the doc, links, etc. that make it easier for people to use.

doc/git-wtu/index.md

doc/git-wtp/index.md

doc/git-wtls/index.md

doc/git-wtl/index.md

doc/git-wta/index.md

gitalias.txt

Co-authored-by: Lorenz Leutgeb <[email protected]>

dabrown645 · 2023-10-21T18:58:28Z

Sorry it took me a while to get back I was on mini vacation with grand kids.

wtd was chosen for 'worktree remove' because worktree has a repair option which would conflict with wtr so I chose wtd for remova and it has same concept and doesn't conflict with wtr for worktree repair.

As you pointed out wtu is missing an assignment it should be wtu = worktree unlock do you want an other pull request with the correction

joelparkerhenderson · 2023-10-21T22:07:42Z

Thanks for the new info. I believe that you're able to push a correction for wtu into this pull request, and also revert the README deletion, and then this PR is good to merge. (Or if you prefer, I can do all that for you)

lorenzleutgeb

gitalias.txt in the base branch is outdated.

lorenzleutgeb · 2023-10-22T07:47:04Z

gitalias.txt

@@ -485,59 +513,59 @@
  add-alias = "!f() { \
      if [ $# != 3 ]; then \
        echo \"Usage: git add-alias ( --local | --global ) <alias> <command>\"; \
-        echo \"Error: this command needs 3 arguments.\"; \


Please don't forget to update your base branch, so that it is at or ahead of 95d5fda.

... and as of now it should be at or ahead of 12c40fc. There are conflicts to resolve now anyway.

Unresolved this conversation, as I do still see unexpected/unrelated changes in gitalias.txt even after @dabrown645's merge commit ca6abe3.

joelparkerhenderson · 2023-10-23T19:48:39Z

If you prefer me to add the aliases for you, rather than trying to do this pull requests, let me know.

This is because this pull request is a bit more complex than a typical one would be, because the .gitconfig file is large, and there are significant changes happening this week, so your changes are being blocked by the newer changes. Happy to explain more if that could be helpful for you.

dabrown645 · 2023-10-30T16:51:45Z

I understand there is a lot going on with gitalias and if it is easier for you to add the wortree aliases then trying to do this pull request I am ok with that.

Have you thought about breaking gitalias up into 2 pieces that could be included one with the aliases and one with the workflow. This would make it the configuration cleaner if someone chooses a different workflow or no aliases for workflow. I have noticed some issues with my workflow and using worktrees that I am working through now.

joelparkerhenderson · 2023-10-30T17:51:29Z

if it is easier for you to add the wortree aliases then trying to do this pull request I am ok with that.

Thank you. I'll proceed with this.

Have you thought about breaking gitalias up into 2 pieces

Yes. Some teams really like this approach because it's flexible. Other teams really dislike this approach because they have to track multiple files. What seems to satisfy both kinds of teams, in practice, is for them to use gitalias.txt as one big starter file, then write team-specific overrides in their own separate files.

I have noticed some issues with my workflow and using worktrees that I am working through now.

Can you say more about this?

dabrown645 · 2023-10-31T20:29:31Z

I have noticed some issues with my workflow and using worktrees that I am working through now.

Can you say more about this?

First let me confess I am not a git expert I am a retired system administrator and used get to keep some control the scripts that automated a lot of the work I did. I have worked with development teams and their various workflows but never quite settled on one for my stuff. I think my issues with worktrees is the way I set them up. I followed some guidance to manage directory chaos using bare repository (https://morgan.cugerone.com/blog/how-to-use-git-worktree-and-in-a-clean-way/).
The article identified on issue and fix when trying to fetch remote branches.

When I tried creating a pull for this changed I ran into anther problem . I cloned with the bare repository did wta main and changed into it to add remote tracking it didn't work. I figured out that if I went into the bare repo and add remote tracking it worked.

Right now I don't know if there are any other issues I will run into or if I need to make a change to the way I set up my clone.

joelparkerhenderson · 2023-11-01T05:55:56Z

Good info and context, thank you.

Git worktrees and bare repos are great features. They do tend to make things more complex.

For example, in 100+ teams where I've used git, only 1 team is using worktrees and bare repos regularly. Nearly all the other teams do typical work on one branch, and use stash in the rare case it's needed (as the article you sent describes). A handful of teams prefer to do a "wip" commit, meaning "work in progress"; later on, when a teammate decides to work on that branch again, then the teammate amends the commit with more work and a better commit message, or does more commits then squashes.

dabrown645 added 2 commits October 18, 2023 15:53

NEW: Added aliases for 'worktree' subcommand

cab0221

FIX: Updated README.md to link to doc/index.md

08c3fb9

I noticed after pushing up to github the README.md didn't have my updates so I linked to doc/index.md so there is only one source of truth

lorenzleutgeb requested changes Oct 20, 2023

View reviewed changes

joelparkerhenderson and others added 5 commits October 20, 2023 22:14

Update doc/git-wtu/index.md

a70380f

Co-authored-by: Lorenz Leutgeb <[email protected]>

Update doc/git-wtp/index.md

8eb4d70

Co-authored-by: Lorenz Leutgeb <[email protected]>

Update doc/git-wtls/index.md

0fdc33c

Co-authored-by: Lorenz Leutgeb <[email protected]>

Update doc/git-wta/index.md

67ec019

Co-authored-by: Lorenz Leutgeb <[email protected]>

Update doc/git-wtl/index.md

041d53c

Co-authored-by: Lorenz Leutgeb <[email protected]>

Fix: added missing wtu assignment

a64c94a

lorenzleutgeb requested changes Oct 22, 2023

View reviewed changes

Merge branch 'main' into worktree-aliases

ca6abe3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Worktree aliases #104

Worktree aliases #104

dabrown645 commented Oct 18, 2023

joelparkerhenderson commented Oct 19, 2023 •

edited

Loading

dabrown645 commented Oct 21, 2023

joelparkerhenderson commented Oct 21, 2023

lorenzleutgeb left a comment

lorenzleutgeb Oct 22, 2023

lorenzleutgeb Oct 23, 2023 •

edited

Loading

lorenzleutgeb Oct 23, 2023 •

edited

Loading

joelparkerhenderson commented Oct 23, 2023

dabrown645 commented Oct 30, 2023

joelparkerhenderson commented Oct 30, 2023

dabrown645 commented Oct 31, 2023

joelparkerhenderson commented Nov 1, 2023

Worktree aliases #104

Are you sure you want to change the base?

Worktree aliases #104

Conversation

dabrown645 commented Oct 18, 2023

joelparkerhenderson commented Oct 19, 2023 • edited Loading

dabrown645 commented Oct 21, 2023

joelparkerhenderson commented Oct 21, 2023

lorenzleutgeb left a comment

Choose a reason for hiding this comment

lorenzleutgeb Oct 22, 2023

Choose a reason for hiding this comment

lorenzleutgeb Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

lorenzleutgeb Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

joelparkerhenderson commented Oct 23, 2023

dabrown645 commented Oct 30, 2023

joelparkerhenderson commented Oct 30, 2023

dabrown645 commented Oct 31, 2023

joelparkerhenderson commented Nov 1, 2023

joelparkerhenderson commented Oct 19, 2023 •

edited

Loading

lorenzleutgeb Oct 23, 2023 •

edited

Loading

lorenzleutgeb Oct 23, 2023 •

edited

Loading