1

all the files in the folder are adding except the following one, i dont know what the issue, i guess there is a .git folder is that something related.

enter image description here

enter image description here

There are files and folders in the dompdf-module, need to be added to the repo.

enter image description here

These was the response after i add the files from the folder dino/dompdf-module

enter image description here

user3929758
  • 233
  • 2
  • 3
  • 15
  • I have edited the answer to include the deletion of the submodule approach: you can now read http://stackoverflow.com/help/accepted-answer – VonC Sep 11 '15 at 17:30

1 Answers1

0

"modified content" means dompdf-module is the root folder of a git submodule, which is like a kind of nested git repo with modifications of its own. A diff should show it "dirty". You could ignore that state if you wanted to.

You should:

  • go in that folder and git add -A .; git commit -m "modif in dompdf-module"
  • go back in the parent repo, and add and commit the new dompdf-module gitlink (special entry in the index which records the new SHA1 for that submodule)

Note: after discussion, it appears that:

git diff . returns Unable to create health/.git/index.lock, which means the git process has somehow crashed.

Since that git is an old 1.9.5, I asked to upgrade to 2.5.2, in which case, there is no more "modified content" message, and everything seem clea.

Side note: the submodule has been cloned from an url not owned by the user. If any modification need to be done in it, the OP would need to fork that repo, and change the url of the submodule.

Another approach is to delete the submodule, but keep it on the disk, then making it part of the main repo: no more nested .git folder.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • but still my folder not adding files to the remote – user3929758 Sep 11 '15 at 14:02
  • @user3929758 did you add and commit within `dompdf-module`, and then add and comit in the parent folder of `dompdf-module`? When you are in that parent folder, what does a `git diff .` returns? – VonC Sep 11 '15 at 14:04
  • Unable to create health/.git/index.lock – user3929758 Sep 11 '15 at 14:09
  • @user3929758 what version of Git for widows are you using? – VonC Sep 11 '15 at 14:18
  • git version 1.9.5.msysgit.0 | Windows 8.1 – user3929758 Sep 11 '15 at 14:22
  • @user3929758 can you try with git 2.5.2: no need for setup, just uncompress [PortableGit-2.5.2-64-bit.7z.exe](https://github.com/git-for-windows/git/releases/download/v2.5.2.windows.1/PortableGit-2.5.2-64-bit.7z.exe) anywhere you want and call `c:\path\to\PortableGit-2.5.2-64-bit\git-bash.exe`. – VonC Sep 11 '15 at 14:23
  • Update to latest, but still remains the same – user3929758 Sep 11 '15 at 14:38
  • Let us [continue this discussion in chat](http://chat.stackoverflow.com/rooms/89396/discussion-between-user3929758-and-vonc). – user3929758 Sep 11 '15 at 14:38