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 Nested Git Repository #76

Open
kartik-212004 opened this issue Dec 16, 2024 · 8 comments · May be fixed by #77
Open

Fix Nested Git Repository #76

kartik-212004 opened this issue Dec 16, 2024 · 8 comments · May be fixed by #77

Comments

@kartik-212004
Copy link

We are facing issues with the repository due to the following reasons:

  1. Nested Git Repository: The backend/EduAid directory contains its own .git folder, which is being treated as a separate Git repository inside the main repository. This causes conflicts and makes the repository structure inconsistent.

Steps to Reproduce:

Clone the Repository:

git clone https://github.com/AOSSIE-Org/EduAid.git
cd EduAid

Navigate to the backend folder and run the following shell script:

./script.sh

now Write the following git command*

git add .

Expected Issue

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
modified: backend/EduAid (untracked content)

@kartik-212004
Copy link
Author

/assign

@manthanabc
Copy link

what happened is you clone the repository again inside the backend folder, (not you the script.sh) since it did not find the repository at the current folder (ig it was intended to be used from outside the repo, which is still not correct since it extracts it to projectroot/s2v_old instead of projectroot/backend/s2v_old where the server expects it to be).
this is an issue with the script.sh. i'll create a PR to fix this since the does not align with what readme.md says about installation.
and it should be named something more meaningful like get_s2v.sh and should only download and extract it, in the backend folder as expected.
For now you can manually download from here extract the file in backend directory
also since you already cloned the repository inside backend make sure to remove it before committing your changes!

@kartik-212004
Copy link
Author

Yes i am also working on the PR

@manthanabc
Copy link

oh, wanna co-author?

@kartik-212004
Copy link
Author

Yeah sure , but it about to get complete

@kartik-212004
Copy link
Author

I changed the script.sh

@vikasp07
Copy link

To solve the issue of a nested Git repository in backend/EduAid, first we will have to remove the .git folder inside backend/EduAid to stop treating it as a separate repository , after this then we will to add the directory to the main repository, and push them to the remote repository. This will ensures a clean and consistent repository structure.

@manthanabc
Copy link

@vikasp07

This will ensures a clean and consistent repository structure.

I doubt that, having the repo cloned inside the backend folder for no reason is neither clean nor consistent 😭
, apart from that this issue is solved in above tagged PRs, if you have any further improvements you are welcome to mention them.

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

Successfully merging a pull request may close this issue.

3 participants