Questions tagged [git-subrepo]

git-subrepo command "clones" an external git repo into a subdirectory of your repo. Later on, upstream changes can be pulled in, and local changes can be pushed back.

git-subrepo command clones an external git repo into a subdirectory of your repo. Later on, upstream changes can be pulled in, and local changes can be pushed back.This command is an improvement from git-submodule and git-subtree. All the subrepo commands use names of actual Git commands and try to do operations that are similar to their Git counterparts.

32 questions
1
vote
0 answers

Using git subrepo or tree like SVN external

We are transitioning from SVN to git finally, thank the gods and little fishes. But we have a very extensive library system that lives in SVN externals. --Libraries…
1
vote
0 answers

Intermittant TabError: inconsistent use of tabs and spaces in indentation (only on CircleCI)

I have just transitioned my program from python2 to python3. Everything checks out on my computer. When I run pytest, it works fine. When I commit to github, and circleci test it, it get: ImportError while loading conftest…
Brian Postow
  • 11,709
  • 17
  • 81
  • 125
1
vote
1 answer

How to version-control multiple, dependent projects in one directory (e.g. web2py, django)

I'd like to get some advices to best handle and version control projects, which exhibit the following structure: From a parent project (shared among many projects), I need to get a given directory structure and files, i.e. . |-- modules/ | |--…
physicus
  • 361
  • 4
  • 12
1
vote
1 answer

git submodules, subtrees or else

Probably, i misunderstood how git works, I have my directory structure as follows: project (git-repo) project 1 (git-repo) project 2 (git-repo) common scripts (git-repo) All these folders have their own repositories where the main project can…
TheRimalaya
  • 4,232
  • 2
  • 31
  • 37
1
vote
1 answer

Tracking a child-repository in the parent, preserving pull-ability

I can't figure out if subtrees, or otherwise are the answer here; I really only know that submodules (probably) are not. I have a repository at ./parent (with it's remote on GitHub) I want to clone a remote repository into ./parent/child I want to…
Dan Lugg
  • 20,192
  • 19
  • 110
  • 174
1
vote
0 answers

npm install Cloning into bare repository, fatal: unable to access

I have got problem on my droplet server. My package.json was having package from git repository like this: "bootstrap": "git+http://git.pff.com.pl:8081/angular2-shared/Bootstrap4Eniro.git", when I've changed this to: "bootstrap":…
Dariusz Filipiak
  • 2,858
  • 5
  • 28
  • 39
1
vote
1 answer

Remove git subtree to add git subrepo

I had a Git repo with the model (the M in MVC) of the project removed and deposited into a separate repo. Then I merged it back with git-subtree. So I have a models branch and what I think are remote tracking branches remotes/models/master…
huggie
  • 17,587
  • 27
  • 82
  • 139
0
votes
0 answers

Best way to mirror resources from a separate Git repo, inside another repo with no need to commit or push?

So there is three ways to do this and I'm looking for the best fit for my current situation. Here is a good write up about the differences: https://github.com/ingydotnet/git-subrepo/blob/master/Intro.pod I have a Unity project in which I have a…
esbenr
  • 1,356
  • 1
  • 11
  • 34
0
votes
0 answers

git-subrepo: Failed to 'git ls-remote --symref https://git-codecommit.us-east-1.amazonaws.com/v1/repos/'

I am failing to create a git subrepo inside of the AWS CodeCommit repository. I managed to clone this repository without any problem, but when I run git subrepo or git-subrepo commands inside of the parent directory I am getting this: $ git-subrepo…
AnaDyn
  • 1
  • 1
0
votes
0 answers

How to push repo to subtree

I want to push my frontend repo to a directory of a remote repo. E.g. push the repo to the app directory of remote. Frontend repo: /-- |- tsconfig.json |- webpack.config.js |- ... Remote: /-- |- app/ |- tsconfig.json …
0
votes
1 answer

Using git subrepo of the master repo in BB recipes

A BB recipe typically checkouts a (git) repo using the given hash. This requires committing and pushing source code changes to a repository which is used by the BB recipe. To prevent continuously committing and pushing, AND updating the hash in the…
Juno
  • 1
0
votes
1 answer

How to cherry-pick from superproject repo to subfolder repo?

After splitting a subfolder out into a new repository can you still use the original repo as a remote and cherry-pick pruned commits to the new repository. The only option I could think of is getting the filter-branch the second time, pushing it as…
monchisan
  • 590
  • 8
  • 24
0
votes
1 answer

How do I remove untracked directory tree (submodule / sub-repository) from main git repository?

For the life of me I can't seem to 'remove' an untracked sub-module/directory from the main git repository. I've tried various syntaxes, but I keep getting the 'pathspec' error stating there was no match, even though the folder is there in plain…
skeetastax
  • 1,016
  • 8
  • 18
0
votes
1 answer

Create top repo branch with specific subrepo branches

Have a git infrastructure that consists of one top repo with several subrepos. Then we have a Jenkins infrastructure that takes a specific top-repo-branch to execute a pipeline on it. Now I have committed and pushed code to a custom branch in one of…
AlexGeorg
  • 967
  • 1
  • 7
  • 16
0
votes
0 answers

Develop in subrepo without committing to original repo

We have a private Git repo with our project and we currently have another well-known repo in a subfolder there - as a subrepo (using https://github.com/ingydotnet/git-subrepo). When a new release of the well-known repo becomes available, we would…
Flore
  • 1
  • 1