git tracking submodule files from “super project”
I have some large legacy git repository which I divided into modules. My problem is when I try to apply a patch created when we don't use submodule super-project doesn't have the track of submodule files.
Here my steps:
$ git clone email@example.com:super-project
$ cd super-project
$ git clone firstname.lastname@example.org:my_submodule
$ git submodule add ./my_submodule
$ git submodule init
$ git submodule sync
$ git submodule update
$ git add .gitmodules
$ git commit -a
$ git am ~/patches/*
Applying: <PATCH NAME>
error: <PATH TO FILENAME>: does not exist in index
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
I am adding a submodule to my project which contains another git repo. To get the module I ran: git submodule add git://github.com/biakaveron/debug-toolbar.git modules/debug-toolbar Then ran: git sub
guys, I just used submodule to organize some Git repos, here's the address: repos I want to move all the submodule into a new directory called repos, for examples, jquery -> repos/jquery. I change
I'm using a git submodule (let's call it SubmoduleRepo) so that I can include my module in couple of projects. I can commit to SubmoduleRepo from any project that uses it. I can update, commit and pu
my Hg repo now needs to include a Git submodule (Restkit) as per the advised method in the site wiki. However, I am not updating the git contents and should only be potentially reading/pulling in chan
I have a git project, we will call it 'A', that has a submodule, which we will call 'B'. I have been following the guide from, http://git-scm.com/book/en/Git-Tools-Submodules, and all of the questions
I have one GIT repository: my_git_repo and I added a submodule: my_git_repo\submodule That is OK, now: Is possible to add files (and change ?) to submodule but keep the tracking in the parent my_git_
When I roll back my git working directory to a particular commit, the submodule shows as modified. The submodule is checked in and has no modified files, but it's at different commit than it needs t
I'd like to use git submodule. The steps I need to take to push my changes to my project are add/commit/push from submodule directory add/commit/push from parent directory Steps I need to take to
What I did I made a new Single Page App project in my application called parent. I made a new Static library project called child and I've Added it as a git submodule in my parent project folder.
I have a submodule in a project in jenkins. I've enabled the advanced setting to recursively update submodules. When I run the build, I see that the workspace has the files from the submodule. The pro
Is there any way to protect your files(php files/images files) from tracking ?? (TeleportPRO, HTTrack, etc) -Thanks for your time!
I am learning to use git. I started with a small project and did git init inside the project directory. Then I added all files to the staging area by doing git add *. But then I realized, I did not w
Whenever I use submodules in git find myself doing git submodule init git submodule update What's the logic in two commands when you basicly do those commands every time?
This question already has an answer here: How do I add files without dots in them (all extension-less files) to the gitignore file? 1 answer I use an HDL simulator which creates lots of large (
The structure of my project is: I added RestKit as submodule. When I run git submodule update -i I get an error: fatal: reference is not a tree: da5895a5e0d1f827ccc0b94a0fe51f385875b4f8 Unable to che
I realize you can set the depth of a submodule manually when updating it, see here, but is it possible to set that automatically, say as an option in the gitconfig? This way I could set it so when upd
I have one repo https://github.com/aikiframework/json and add submodule using git submodule add email@example.com:jcubic/json-rpc.git json-rpc and do commit and push, it appear on github (I can click on
In svn you can link a repository to any folder in another svn repository. I'm wondering if there is a similar feature for git? Basically I want a git submodule inside my repository, but I want the sub
I've got an Xcode project under git and I've got a experimental branch off of my master branch. Both branches have diverged since the branch (so no fast-forwarding!), and I am merging experimenta
I am currently trying to clone some of my vim settings from my git repo, and the repo mostly contains submodules of other hosted projects. However, when I try to update all of my submodules, I get the
I followed David Winter's workflow to Install and Manage WordPress with Git. WordPress is a git submodule. On the latest WordPress 3.9 upgrade, I accidentally updated through the WordPress admin ins
I have a git submodule which is constantly showing modified in git status even though I never update it. # On branch master # Changes not staged for commit: # (use git add <file>... to updat
I have a project in git. It has a couple of submodules. Without going into the submodule and doing a git status or similar, is there a way to tell which commit, branch, and tag it the main project thi
How do I move files and folders in my master repo into an existing submodule? Can I preserve history somehow?
I have a project with a submodule that is pointing to an invalid commit: the submodule commit remained local and when I try to fetch it from another repo I get: $ git submodule update fatal: reference
I was pretty happy when I found out lately about git submodule summary which shows me nicely by which commits the checked out commit of a submodule is ahead or behind the reference in the repository.
I've a repo with some external git repos as submodules. I made some changes in these submodules, but I've no way of pushing them upstream. How do I commit my changes to my repo without needed to push
I have moved subdirectory in separate repository and then included it as submodule. Now I want to rebase another branch on top of that change. israfel:proj almad$ git rebase -i origin/master error: co
I have a cakephp project. Let us call it Project Super. It has its own github repo. Super has git submodule that pulls from this repo. https://github.com/predominant/TwigView The issue is that I need
Git Gui is showing over 8000 files from the .gem and AppData directories which is preventing me from seeing my actual repository. How can I prevent git from seeing these files?
Is there a way in git to track binary files without git caring about the contents? The tracking would mainly be for historical reasons. If not; is there a way to have git track all files but ignore co
I have set up some remote tracking branches in git, but I never seem to be able to merge them into the local branch once I have updated them with 'git fetch'. For example, suppose I have remote branch
I add a submodule from a git@... URL, to be able to develop in it. Now I want to deploy the app and replace the URL with an git://... one, so it doesn't need authentication to the submodule's repo fro
I'd like to create a repo which pulls in a remote repo. For example, let's say jQuery as a submodule: git://github.com/jquery/jquery.git What would be the process of creating a repo with jQuery as a
I love git submodules. Also, I hate git submodules. What I love about them is how it enables to you to cleanly compartmentalize dependencies etc. I get the point of having them point to a specific com
I have a Django project and it's currently hosted in GitHub and it's private. I'm looking to move many useful parts of it into an open-source project. I think I need to use a 'submodule' thing, but un
I know the support for git submodules is limited in JGit, but still was wondering how can I achieve this: git submodule foreach git checkout <branchName> and similar commands using JGit. Or is t
I'd like to create a new repository as a submodule of my project. Usually, I create a Github repo and then add it as a submodule using the command git submodule add url_to_repo.git Is there a way to c
I have been trying to get one Nsight project (project 1) to use some files from another Nsight project(2), and for the life of me can't get the project 1 to build! I have tried referencing/setting inc
How should I set up a git submodule to prevent a detached head? When I check out my project, it has a submodule and the submodule also has a submodule. Now I want someone else to be able to checkout t
I get the following error when I try adding a submodule to my repository: fatal: pathspec 'submodule' did not match any files I had some issues with my submodules so I had to remove them all (remove
I want to setup git server with SugarCRM. There are some files and folders needed to be protected and I want to allow only some to be able to developed etc. How it is possible with git?
I am using a git submodule in a very usual way. The way how people typically update a submodule is by checking it out, pulling something in the submodule and then commiting outside. Now, I typically d
I do not know why, but somehow two files were added to project with a mistake as you can see on screenshot. How can I safely remove them from Xcode project? I've already deleted them from disk, but de
Suppose you have a repository called super and a submodule called sub. Stand in super, I'd like to know if sub last commit is already pushed to the repository or if it's local.
I have tried pushing several eclipse projects to github repos. Every time I have trouble later cloning or fetching them back into eclipse. The reason seems to be that the eclipse specific project file
Let's say I have 3 git repositories, each with a lib and tests folder in the root. All 3 repositories are part of what I want to be a single package, however it is important to me to keep the reposito
I have a complex repository where sometimes the logical boundaries between code segments crosses directory boundaries. Sometimes a single file in directory X really needs to go with files in directory
How can I untrack files in git, but leave the untracked files in repository? To better understand that problem let me show an example: I have a git repository with my project and I want to add wordpre