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

GeanyVC:(Git) Fallback to git rev-parse for getting the repo/worktree's top directory #1028

Merged
merged 1 commit into from
Apr 26, 2022

Conversation

nomadbyte
Copy link
Contributor

Fixes #285.

@nomadbyte
Copy link
Contributor Author

For some reason this fix did not make it into the 1.38. Is there any more details needed for this?

@nomadbyte
Copy link
Contributor Author

@elextr This one too has not been getting any merge-love for very much long while. Anything else for me to do to get this off my PR list?

Just re-checked, the behavior complies with the use-case listed in the #285 for what it's worth.

@elextr
Copy link
Member

elextr commented Apr 26, 2022

Just re-checked, the behavior complies with the use-case listed in the #285 for what it's worth.

To be clear, I don't use geanyvc, so I won't spend time understanding enough of the plugin code to be able to review the change, similarly setting up a sacrificial git repo to test it. Especially when related to git workflows and stuff.

Although it would be preferable that some other user (like the OP of #285) tests it, in the end if it sits too long and nobody does then IMHO if the plugin maintainer says so (and the build passes) it should be merged.

Can you trigger the new CI by pushing an inconsequential change, after all its a year since it was tested, I'm sure there is a comment that needs improving/adding :-)

…ee's top directory

An example setup for worktree:

```
mkdir r1
cd r1

git init
git config user.name testuser
git config user.email testuser@
echo "f1" >> f1
git add f1
git commit -a -m "added f1"

git worktree add ../w1 -b work1
echo "f1:r1" >> f1
git status

cd ../w1
git status
echo "f2" >> f2
git add f2
git commit -a -m "added f2"
echo "f1:w1" >> f1
git status
```

All VC actions should be available for all files in each worktree.
@nomadbyte nomadbyte force-pushed the geanyvc/285-git-worktree branch from 9fb5de0 to 187dfc2 Compare April 26, 2022 02:46
@nomadbyte
Copy link
Contributor Author

nomadbyte commented Apr 26, 2022

Here it is -- the commit comment now has the use-case in it too, the code is also now up-to-date with current master.

@elextr Do you favor a VCS other than Git? Which one?

@elextr
Copy link
Member

elextr commented Apr 26, 2022

I use git but not geanyvc (since I mostly do C/C++ and that not in Geany).

Ok, build passed, so safe(ish) to merge, since the CI builds all plugins, if one of them fails the whole build fails and so subsequent PRs all show as failing even if they are for a plugin other than the one that failed (see recent problems with Geanylua failing other plugins).

@elextr elextr merged commit 7900eb3 into geany:master Apr 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GeanyVC: Support for git worktree
3 participants