`push` requires manually removing previous branch if subrepo directory has a dot in it

[tomek-he-him]

Hey, first of all thanks for this brilliant project!

We keep our cross-repo workflow and CI scripts in a subrepo checked out in a hidden directory scripts/.platform-scripts. Any time we try to push, we need to remove a leftover branch before:

$ git subrepo push scripts/.platform-scripts
git-subrepo: There is a previous push branch 'subrepo-push/scripts/%2eplatform-scripts'. Delete it first.

(last exit code: 1) $ git branch -d subrepo-push/scripts/%2eplatform-scripts
error: The branch 'subrepo-push/scripts/%2eplatform-scripts' is not fully merged.
If you are sure you want to delete it, run 'git branch -D subrepo-push/scripts/%2eplatform-scripts'.

(last exit code: 1) $ git branch -D subrepo-push/scripts/%2eplatform-scripts
Deleted branch subrepo-push/scripts/%2eplatform-scripts (was 5837e6d0e).

$ git subrepo push scripts/.platform-scripts
Subrepo 'scripts/.platform-scripts' pushed to 'git@github.com:kalohq/platform-scripts.git' (master).

This doesn’t happen in other projects I use git-subrepo in. I suppose it might have to do with the fact that scripts/.platform-scripts has a dot in the directory name?

[grimmySwe]

@ArchitectCodes Thanks for your kind words!

First: What version are you running?
We have some unit tests for different extras like dots but there might be cases that it doesn't cover. When you push, you don't get any complaints? So even if it works ok, you will still have an extra directory afterwards?

[tomek-he-him]

What version are you running?

I cloned at commit a7ee886, which still seems to be the tip of master.

When you push, you don't get any complaints?

Nope, the last line executes without any problems. 🙂 But by mistake, I didn’t paste the output of the last command in the initial report. Sorry for that, just added the line:

Subrepo 'scripts/.platform-scripts' pushed to 'git@github.com:kalohq/platform-scripts.git' (master).

So even if it works ok, you will still have an extra directory afterwards?

I don’t actually have an extra directory. The only thing that seems to be unexpected is that the branch subrepo-push/scripts/%2eplatform-scripts seems not to get pruned (supposing it should):

$ git subrepo push scripts/.platform-scripts
Subrepo 'scripts/.platform-scripts' pushed to 'git@github.com:kalohq/platform-scripts.git' (master).

$ git branch | grep subrepo
  subrepo-push/scripts/%2eplatform-scripts
  subrepo/scripts/%2eplatform-scripts

[suburbanbuddha]

I may have replicated this bug recently:

1. Created a shared development container repository - i.e.: devcontainer
2. Created a package repository that needed a development container - i.e.: my-package
3. Opened my-package in Visual Studio Code
4. Added the devcontainer to my package via the integrated terminal by running git subrepo clone <URL> .devcontainer -b master

This resulted in the .git/tmp/subrepo/<folder> being named %2edevcontainer instead of .devcontainer, and "There is no worktree available, use the branch command first." error when executing subsequent git subrepo commands.

Accordingly, I just wanted to check if anyone found a workaround, since this issue is open.

For now, I've created a .devcontainer alias using ln -s.

[reidgould]

I have encountered a similar error which may have the same root cause.

I encountered a merge conflict in a subrepo that has a name starting with a period character, .obsidian.

$> git subrepo pull .obsidian
The "git merge" command failed:

  Auto-merging plugins/obsidian-excalidraw-plugin/data.json
  CONFLICT (content): Merge conflict in plugins/obsidian-excalidraw-plugin/data.json
  Automatic merge failed; fix conflicts and then commit the result.

You will need to finish the pull by hand.
A new working tree has been created at .git/tmp/subrepo/%2eobsidian so that you can
resolve the conflicts shown in the output above.

This is the common conflict resolution workflow:

  1. cd .git/tmp/subrepo/%2eobsidian
  2. Resolve the conflicts (see "git status").
  3. "git add" the resolved files.
  4. git commit
  5. If there are more conflicts, restart at step 2.
  6. cd /mnt/c/Users/ReidG/data/repo/notes-vcm
  7. git subrepo commit .obsidian
See "git help merge" for details.

Alternatively, you can abort the pull and reset back to where you started:

  1. git subrepo clean .obsidian

See "git help subrepo" for more help.    

I follow all the recommended steps, resolving the conflicts and committing them.

But on the last step, the following error occurs.

$> git subrepo commit .obsidian 'subrepo/%2eobsidian'                     
git-subrepo: There is no worktree available, use the branch command first

My guess is that the git subrepo commit command does not properly encode the . character, so it checks for the existence of a worktree named .git/tmp/subrepo/.obsidian, instead of the one that exists named .git/tmp/subrepo/%2eobsidian and so it fails.

[reidgould]

I submitted PR #635 to fix the issue I encountered. Perhaps the other issues discussed in this thread have similar resolutions.