Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git: publish from certain commit onward, keeping earlier history private, but provable

Tags:

git

git-rebase

I've been hacking away on a library for quite some time and have a lot of commits in my private repository:

A -> B -> C -> D -> E

Finally, I'm nearing completion of a first version, and want to publish it to a remote called public from D onward keeping A..C to myself, so public should afterwards look like this:

D -> E

On demand, I'd like to be able to prove how i arrived at D though (think of copyright claims, etc). As (at the moment) it's pretty much impossible to reverse-engineer the hashes of commits in the chain with times and changesets, i thought just keeping D's parent pointer to C would be one of the genius advantages of git. Sadly i can't find a way to actually make this work.

So, how can i push D -> E to public making it a fully functional public repository with all the necessary objects included to checkout D or E and D still pointing to C as parent?

What doesn't work:

push with range

git push public D..E:master
error: src refspec D..E does not match any.
error: failed to push some refs to '<public>'

any form of squashing / history rewriting

As far as i know squashing A..D would introduce a new commit removing the parent pointer to C and thereby removing provability of the existence of A..C. (Simple example: say C reversed B, then you'd never be able to prove B was in there at some point.)

I could obviously manually note the hash of C in the description of the squash commit, but there already is a parent pointer field, why not use it?

Also in order to contribute further changes to public I'd have to rebase my private branches on top of this new squashed commit, which just seems as wrong...

push from local clone with limited depth

I thought i found a solution to this by first creating a local clone local_public with the desired depth before pushing that clone to public like this:

git clone --depth 2 file:///<abspath_private> local_public

With

git log --pretty=raw

I can verify that local_public only contains D -> E and that the commit, tree and parent hashes are the same, which is exactly what i want.

The problem is that when i try to push to an added public remote from local_public i get an error like this:

 ! [remote rejected] master -> master (shallow update not allowed)

Any ideas how to make this work?

like image 430
Jörn Hees Avatar asked Nov 10 '22 00:11

Jörn Hees


1 Answers

What you want is not possible.

Commits in Git work like a linked list. Each commit has the ID of the parent commit (or null if root commit)... The ID of the parent commit is part of the identity of a commit.

To push D -> E to a repo, you will need to modify the parent of D, and that will cause the HASH of D to change, which in turn will require the hash of E to change as well (as E will have a new parent).

like image 144
C. Augusto Proiete Avatar answered Nov 15 '22 06:11

C. Augusto Proiete