Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

per-worktree machete option #517

Closed
1wsx10 opened this issue May 11, 2022 · 11 comments · Fixed by #545 or #551
Closed

per-worktree machete option #517

1wsx10 opened this issue May 11, 2022 · 11 comments · Fixed by #545 or #551
Assignees
Labels
feature New feature or request underlying git Relates to underlying git operations
Milestone

Comments

@1wsx10
Copy link

1wsx10 commented May 11, 2022

https://xkcd.com/1172/

i actually found this very helpful, would be great if there was an option for it.

@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

this was fixed here:
#361
#360

@PawelLipski PawelLipski added the underlying git Relates to underlying git operations label May 11, 2022
@PawelLipski
Copy link
Collaborator

Haha I didn't know this xkcd... applies here perfectly indeed 😅 could you provide more details on how your workflows around worktrees look like? even pieces of bash_history could be useful (unless confidential ofc)

@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

i have a script that deletes a worktree, and removes local branches that have been merged to the remote and aren't found in any other worktrees.

its also handy for keeping track of which local branches are 'tied' to which worktrees. i know they aren't actually tied but with long builds you generally want to keep a worktree on the same version for as long as possible.

@PawelLipski
Copy link
Collaborator

Okay! so machete.worktree.useTopLevelMacheteFile FTW, I'm putting this issue into the next milestone (v3.10; might end up in v3.11, actually)

@PawelLipski PawelLipski added this to the v3.10.0 milestone May 11, 2022
@PawelLipski PawelLipski added the feature New feature or request label May 11, 2022
@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

thats awesome, thanks :)
unfortunately brew deprecated backdating... i guess i'll have to install it manually

@PawelLipski
Copy link
Collaborator

Whoops (coz I'm a Fedora and not Mac OS/Homebrew user myself, I'm only publishing this package to Homebrew tap)... what does actually backdating correspond in Homebrew? Is it equivalent to simply downloading newer versions for the already installed software (like pip install --upgrade or dnf update)?

@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

im not entirely sure.. its slow and bloated, but its the package manager that we have...
the most i know is that you can upload separate versions if you want the older versions to be available after the update. otherwise you can only access the latest.

@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

https://stackoverflow.com/questions/43538993/homebrew-list-available-versions-with-new-formulaversion-format

they used to support backdating to any old version, but now they have to be specifically created as separate releases i guess

@PawelLipski
Copy link
Collaborator

PawelLipski commented May 11, 2022

you can only access the latest.

Oh! okay, that's good, no problem then with shipping that feature in v3.10 or v3.11.

I suppose you mentioned

i guess i'll have to install it manually

for the sake of installing a previous version which has the old logic for worktree's .git/machete location, i.e. v3.6.0 or earlier, right? If so, I'd probably un-install git-machete from Homebrew, and use pip install git-machete==3.6.0 instead (possibly with sudo)

@1wsx10
Copy link
Author

1wsx10 commented May 11, 2022

ahh yeah ill try it with pip. thanks :)

@PawelLipski
Copy link
Collaborator

To be released soon in v3.11.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New feature or request underlying git Relates to underlying git operations
Projects
None yet
3 participants