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: Support for git worktree #285

Closed
cas-- opened this issue Sep 22, 2015 · 1 comment · Fixed by #1028
Closed

GeanyVC: Support for git worktree #285

cas-- opened this issue Sep 22, 2015 · 1 comment · Fixed by #1028

Comments

@cas--
Copy link

cas-- commented Sep 22, 2015

I was using git-new-workdir and recently switched to using the newer form git worktree however found this stops the plugin working.

The reason appears to be that instead of a .git directory in the 'worktee directory' there is a .git file that contains a reference to the original directory. e.g. gitdir: /home/ubuntu/origdir.git/.git/worktrees/newdir.git.

@nomadbyte
Copy link
Contributor

nomadbyte commented Nov 22, 2020

Here's a little test setup to formalize the use-case:

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

Then in Geany, open both files: r1/f1 and w1/f1. Check:

  1. The Version Control actions should be available for both files
  2. Status for each of the f1 files should show the corresponding branch names (master, work1) and state: modified.
  3. Diff for each file should list the respective changes (single line added f1:r1, f1:w1)
  4. Commit dialog should list only one f1 file (per tree)
  5. Commit should succeed for each of the trees
  6. Final history for each file should list only tree-specific commits.

In the current Geany version (1.37), the step 1. above is failing for the w1/f1 file (worktree-based).

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