delete-merged

[raylu]

(continuing from #1057 (comment))

I saw delete-unmanaged when I first read the help, but deleting all unmanaged branches seems scary to me. I only use machete when stacking a PR. for regular branches off of main, I generally don't bother, so my machete status is often out of date

for github sync, I really can't imagine when I would want to add local branches if I don't already have them. I do totally have multiple clones of repos (in different environments), but if I didn't already make a local copy of a branch, I generally don't want it

would you be open adding a delete-merged command that only deletes branches if

1. they have a remote tracking branch (don't delete unpushed branches)
2. the remote tracking branch doesn't exist (only delete merged branches)
3. there are no children/stacks built on top of them

I considered adding a flag like delete-unamanged --remote-deleted-only, but this would delete branches even if they are managed

I'm happy to write the PR if you want

[PawelLipski]

Hmmm just from a quick look:

they have a remote tracking branch (don't delete unpushed branches)
the remote tracking branch doesn't exist (only delete merged branches)

Is this apparent contradiction explained b/c you mean remote tracking branch once as an entry in .git/refs/remotes locally and once a branch (aka an entry in .git/refs/heads) in remote repo? 🤔

I considered adding a flag like delete-unamanged --remote-deleted-only, but this would delete branches even if they are managed

I've thought of slide-out --untracked (#1051) 🤔

I'm happy to write the PR if you want

Wow I'd appreciate that a lot... I slowed down contributions to OSS recently as I've got a lot of work in commercial projects. Let's first smooth out the details ofc

[raylu]

they have a remote tracking branch (don't delete unpushed branches)
the remote tracking branch doesn't exist (only delete merged branches)

Is this apparent contradiction explained b/c you mean remote tracking branch once as an entry in .git/refs/remotes locally and once a branch (aka an entry in .git/refs/heads) in remote repo? 🤔

I mean they have branch.<name>.remote and branch.<name>.merge configuration entries (as in git branch --track) but the branch they are tracking doesn't exist (git branch --remotes doesn't show it because .git/logs/refs/remotes/origin/<name> doesn't exist)

basically, the branch has been deleted on github (by the "automatically delete head branches" setting), your local clone acknowledges it's gone (after git fetch --prune), but you still have a useless local branch

[PawelLipski]

Okay! makes sense indeed

[PawelLipski]

This would be way better than what git machete clean does right now (just remove untracked branches, no matter whether its tracking config exists)

[raylu]

here's what I've got so far: raylu/git-machete@develop...raylu:git-machete:clean. just need to make the tests delete remote branches (or set the config to have a remote branch without pushing)

[PawelLipski]

Wow nice! Pls open a draft PR for that... I'd rather leave clean unchanged & deprecated, TBD where to put this new functionality of yours

[raylu]

#1094

[PawelLipski]

Done, available as git machete slide-out --removed-from-remote