Add --sync-git-dir flag to odo dev #6910
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
do-not-merge/work-in-progress
🔨 Deploy Preview deleted from internal cluster!
|
openshift-ci
bot
added
the
kind/feature
feloy
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
rm3l
reviewed
Jun 19, 2023
There was a problem hiding this comment.
One question that came to mind after quickly testing this: we might need to handle the case where a file matches a rule in .gitignore (or .odoignore) but is also present in the .git folder. For example:
$ odo init --name go-app --devfile go --starter go-starter
$ echo ".odo" >> .gitignore
$ git init && git add -A . && git commit -m "initial commit"
At this point, I have a local branch named 'main' with a single commit, but the .gitignore file also contains an entry matching 'main' as a file name:
$ cat .gitignore
.odo/env
.odo/odo-file-index.json
main
main.exe
.odo
$ find . -name main
./.git/refs/heads/main
./.git/logs/refs/heads/main
$ git log --oneline
4ca3c66 (HEAD -> main) initial commit
Now if I run odo dev --sync-git-dir, the .git folder is synchronized, but not its whole content, because of the rule in .gitignore, I guess:
$ odo dev --sync-git-dir --platform podman
...
$ podman container exec -it go-app-app-runtime git -C /projects log --oneline
fatal: your current branch 'main' does not have any commits yet
$ podman container exec -it go-app-app-runtime find /projects -name main
/projects/main
$ podman container exec -it go-app-app-runtime ls -lhrta /projects/.git/refs
total 0
drwxr-xr-x 1 default root 0 Jun 19 13:49 tags
drwxr-xr-x 1 default root 8 Jun 19 13:52 .
drwxr-xr-x 1 default root 144 Jun 19 13:53 ..
So I think we need to forcibly sync the whole content of the .git folder; otherwise, we might have inconsistent behavior with tools relying on Git.
openshift-merge-robot
added
the
needs-rebase
feloy
force-pushed
the
feature-6893/sync-git-dir
branch
from
ac999a6
to
c458d59
Compare
feloy
force-pushed
the
feature-6893/sync-git-dir
branch
from
c458d59
to
a8c8c35
Compare
openshift-merge-robot
removed
the
needs-rebase
|
Kudos, SonarCloud Quality Gate passed!
|
rm3l
approved these changes
Jun 20, 2023
openshift-ci
bot
added
the
lgtm
|
/override OpenShift-Integration-tests/OpenShift-Integration-tests |
|
@feloy: Overrode contexts on behalf of feloy: OpenShift-Integration-tests/OpenShift-Integration-tests In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/override windows-integration-test/Windows-test |
|
@feloy: Overrode contexts on behalf of feloy: windows-integration-test/Windows-test In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-merge-robot
merged commit 50ba386
into
redhat-developer:main
23 checks passed
openshift-merge-robot
temporarily deployed
to
internal
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this:
/kind feature
What does this PR do / why we need it:
Which issue(s) this PR fixes:
Fixes #6893
PR acceptance criteria:
Unit test
Integration test
Documentation
How to test changes / Special notes to the reviewer: