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

fix #707: failed to set workdir correctly if submodule first opened i… #709

Merged
merged 1 commit into from Jun 10, 2019

Conversation

Projects
None yet
2 participants
@shijinglu
Copy link
Collaborator

commented Jun 5, 2019

git meta fails to set workdir correctly if a submodule is first open in bare mode and then open in normal mode.

The reason is that the repo was first created with initExt method, which will always try to set worktree for submodules. Currently, it sets the worktree to "null" with "bare" option enabled. While correct behavior should be that the worktree config should not be defined at all.

url,
null,
false);
assert.equal(path.relative(repo.workdir(),newSub2.workdir()),

This comment has been minimized.

Copy link
@novalis

novalis Jun 6, 2019

Collaborator

nit: space after comma

@@ -385,7 +385,7 @@ x=S:C2-1 s=Sa:a;C3-1 s=Sa:b;Bmaster=2;Bfoo=3`,
Conflicting entries for submodule ${colors.red("s")}
`,
},
"conflict in submodule": {
"xxx conflict in submodule": {

This comment has been minimized.

Copy link
@novalis

novalis Jun 6, 2019

Collaborator

what's going on here?

This comment has been minimized.

Copy link
@shijinglu

shijinglu Jun 7, 2019

Author Collaborator

ahh, should have removed it. I used to add "xxx" in tests, so I can grep them more easily

@novalis

novalis approved these changes Jun 7, 2019

@novalis novalis self-requested a review Jun 7, 2019

@novalis
Copy link
Collaborator

left a comment

[oops, clicked wrong button]

fix #707: failed to set workdir correctly if submodule first opened i…
…n bare mode then open with normal mode

@shijinglu shijinglu force-pushed the shijinglu:fixBareReopenIssue branch from cbc3b35 to f21ed7f Jun 7, 2019

@novalis

novalis approved these changes Jun 7, 2019

@novalis

This comment has been minimized.

Copy link
Collaborator

commented Jun 9, 2019

Why is that test failing?

@shijinglu

This comment has been minimized.

Copy link
Collaborator Author

commented Jun 10, 2019

Why is that test failing?

Some old flaky test, i didn't spend time investigate why it is flaky :)

@novalis novalis merged commit 14716bd into twosigma:master Jun 10, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.