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

format-patch: if patchdir is a symlink, keep it intact #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

rohieb
Copy link
Contributor

@rohieb rohieb commented Jul 29, 2024

If the patch dir is a symlink, overwrite the folder to which it points instead of removing the symlink.

For further explanation: I have several git worktrees that I use to keep different projects checked out at the same time. In there, I usually keep a folder named bsp-patches pointing to the BSP patch directory to save my from typing the whole path all over again (which especially in Yocto projects can still take a lot of tab key presses). So I'd only like to do umpf tag -fp bsp-patches/.

The 'tig' subcommand makes it possible to browse an umpf interactively
in tig(1) while showing the local and remote state of all topic
branches. This can give a broader overview how the topic branches have
developed before building another umpf.

For simplicity sake, also limit the range of the topics to the history
leading up from the umpf-base.

Signed-off-by: Roland Hieber <[email protected]>
If the patch dir is a symlink, overwrite the folder to which it points
instead of removing the symlink.

Signed-off-by: Roland Hieber <[email protected]>
@michaelolbrich
Copy link
Member

It's a bit too magical to me.

And the workflow looks strange:

  1. I almost never use -f but use -u instead. Does that not work for you?
  2. Worktrees can have their own git configuration (see https://git-scm.com/docs/git-worktree#_configuration_file), so you can set umpf.patch-dir there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants