Re: [RFC] Submodules in GIT
From: Uwe Kleine-Koenig <hidden>
Date: 2016-08-11 20:41:33
Hella Andreas, Andreas Ericsson wrote:
quoted
quoted
The only problem I'm seeing atm is that the supermodule somehow has to mark whatever commits it's using from the submodule inside the submodule repo so that they effectively become un-prunable, otherwise the supermodule may some day find itself with a history that it can't restore.One could circumvent that by creating a separate repo for the submodule at checkout time and pull the needed objects in the supermodule's odb when commiting the supermodule. This way prune in the submodule cannot do any harm, because in it's odb are no objects that are important for the supermodule.Yes, but then you'd lose history connectivity (I'm assuming you'd only pull in the tree and blob objects from the submodule, and prefix the tree-entrys with whatever directory you're storing the submodul in).
That's the reason for me prefering to pull in the complete commit. I don't understand what you mean with "prefix the tree-entrys with whatever directory you're storing the submodul in". Maybe one of us doesn't understand tree objects correctly. AFAICT they don't store the location where they occur, so there is no need to store a prefix. E.g. zeisberg@cepheus:/tmp$ mkdir test-repo zeisberg@cepheus:/tmp$ cd test-repo/ zeisberg@cepheus:/tmp/test-repo$ git-init-db defaulting to local storage area zeisberg@cepheus:/tmp/test-repo$ echo LD_FLAGS=-ltest > Makefile zeisberg@cepheus:/tmp/test-repo$ git add Makefile zeisberg@cepheus:/tmp/test-repo$ git commit -m 'test1' Committing initial tree 754eadab39642175748bb02155d2959176bcf014 zeisberg@cepheus:/tmp/test-repo$ mkdir subdir zeisberg@cepheus:/tmp/test-repo$ cp Makefile subdir/ zeisberg@cepheus:/tmp/test-repo$ git add subdir/ zeisberg@cepheus:/tmp/test-repo$ git commit -m 'test2' zeisberg@cepheus:/tmp/test-repo$ git ls-tree HEAD 100644 blob 610bafd79f92c7e546b104d5b22795df1f099723 Makefile 040000 tree 754eadab39642175748bb02155d2959176bcf014 subdir So the tree that only contains the Makefile specifing LD_FLAGS has the sha1id 754eadab39642175748bb02155d2959176bcf014 independent of being the root of my project or a subtree. But maybe I misunderstood you? Best regards Uwe -- Uwe Kleine-Koenig If a lawyer and an IRS agent were both drowning, and you could only save