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

Place .git and .gitignore in another folder #678

Closed
tildebox opened this issue Mar 2, 2020 · 2 comments
Closed

Place .git and .gitignore in another folder #678

tildebox opened this issue Mar 2, 2020 · 2 comments

Comments

@tildebox
Copy link

tildebox commented Mar 2, 2020

Version info

  • OS: Windows 10, 64-bit
  • Sublime Merge Build: 1204
  • Git: 2.25.1

Description

It works with GitExtensions, but not with Sublime Merge.

Support for core.worktree was in Build 1084.

My structure:

C:\ project \ A \ [Project files]

C:\ git \ A \ .git [Folder]
C:\ git \ A \ .gitignore [File]

Command line

C:\ git \ A \ git config core.worktree C:/project/A
C:\ git \ A \ git config core.excludesFile C:/git/A/.gitignore

After that the C:\ git \ A \ .git \ config file looks like that:

[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
worktree = C:/project/A
excludesFile = C:/git/A/.gitignore

Now I open Sublime Merge and see the changed/untracked files.

But, if I click on Stage I get following error:

fatal: not a git repository: ‘/C/git/A/.git’

In the Console I got 2 lines:

Executing: “C:\Users\blabla\Downloads\sublime_merge_build_1204_x64\Git\cmd\git.exe” “add” “–” “Hello World.txt”
Working dir: C:\project\A

With Command line it works:

PS C:\git\A> git status
On branch master

No commits yet

Untracked files:
(use “git add …” to include in what will be committed)
Hello World.txt

nothing added to commit but untracked files present (use “git add” to track)
PS C:\git\A> git add “Hello World.txt”
PS C:\git\A> git commit -m “initial”
[master (root-commit) e2c7185] initial
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Hello World.txt
PS C:\git\A>

Here I added a new file and clicked stage:

image_2

@dpjohnst
Copy link
Member

dpjohnst commented Mar 3, 2020

Hi @tildebox,

Sorry to hear you're having trouble using Sublime Merge. We will be investigating this issue, and I'll share further updates with you here.

Thanks,
- Dylan

@dpjohnst
Copy link
Member

dpjohnst commented Mar 3, 2020

Hi @tildebox,

Thank you for the report! We've created a fix for this issue, and it should be resolved in the next build of Sublime Merge.

Kind regards,
- Dylan

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

No branches or pull requests

3 participants