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.

Sign up for GitHub

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

Jump to bottom

git: Bump to latest fluxcd/go-git #424

Merged
merged 7 commits into from Dec 8, 2022
Merged

git: Bump to latest fluxcd/go-git #424

merged 7 commits into from Dec 8, 2022

Conversation

pjbgf
Copy link
Member

@pjbgf pjbgf commented Dec 6, 2022 •
edited

Changes Summary:

git/fs: Fix wd detected as outside wd
a85e4cf 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@pjbgf pjbgf added the area/git Git and SSH related issues and pull requests label Dec 6, 2022
stefanprodan
stefanprodan approved these changes Dec 6, 2022
View reviewed changes
Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @pjbgf

Paulo Gomes added 3 commits December 6, 2022 15:19
git/e2e: Ensure repos are initialised in new dir
e908589 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
git/libgit2: Ensure only Flux fs is used
51f482b 
The upstream fs implementation has a few issues.
Due to this, use Flux internal version instead.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
build: Bump fluxcd/go-git
49c90f6 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@pjbgf pjbgf force-pushed the test-gitlab-ce branch 2 times, most recently from 49c2b22 to f7a2814 Compare December 6, 2022 18:03
@pjbgf pjbgf requested a review from aryan9600 December 7, 2022 11:08
aryan9600
aryan9600 requested changes Dec 7, 2022
View reviewed changes
git/gogit/client.go Outdated Show resolved Hide resolved
Paulo Gomes added 2 commits December 7, 2022 14:34
gogit: Auto-stage files from WithFiles
80ff3d5 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
git/e2e: Ensure changes are staged
ebfa51a 
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
libgit2: Adhoc fix for darwin
f51bdb9 
When running in MacOS, the util.Walk func may incorrectly
say that the current dir is not inside the workdir set in
the fs. To workaround the issue we check for the error and
ensure that the path is the same as the
workdir set.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
@pjbgf pjbgf requested a review from aryan9600 December 7, 2022 19:34
aryan9600
aryan9600 approved these changes Dec 8, 2022
View reviewed changes
Copy link
Member

@aryan9600 aryan9600 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! 🚀

@pjbgf pjbgf merged commit 5bf958f into main Dec 8, 2022
@pjbgf pjbgf deleted the test-gitlab-ce branch December 8, 2022 10:02
@pjbgf pjbgf added this to the Bootstrap GA milestone Dec 8, 2022
@aryan9600 aryan9600 mentioned this pull request Jan 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan approved these changes

@aryan9600 aryan9600 aryan9600 approved these changes

Assignees
No one assigned
Labels
area/git Git and SSH related issues and pull requests
Projects
Maintainers' Focus
Archived in project
Milestone
Bootstrap GA
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pjbgf @stefanprodan @aryan9600