[pkg-fso-maint] special git layout - how to package

[Joachim Breitner]

Hi,

Am Dienstag, den 28.04.2009, 09:35 +0200 schrieb Heiko Stübner:
> # git ls-tree -d HEAD
> 040000 tree 0c9aa01b1bc1d089331c8686352b10f530556e50    docs
> 040000 tree 2165fe7795bb83781cb7636a8aa5e5ba9270ce8c    fsodeviced
> 040000 tree 7bfe3b51fd7ab48d9cdf4f6e7f9d7a46c21eef6c    fsogsmd
> 040000 tree 8587df780829d98f75d1e6e2faa579012c73841e    libfsoframework
> 040000 tree 13c2d8e9d2f99974c914189308921515c86b82a6    libfsotransport
> 
> according to [1] to create an empty branch
> #git symbolic-ref HEAD refs/heads/libfsotransport
> #rm .git/index 
> #git clean -fdx
> 
> #echo "import libfsotransport" | git commit-tree \
> 13c2d8e9d2f99974c914189308921515c86b82a6
> Result: efdb84b74e983be9e0cab7aeb9f732c67e1b0c02

looks good so far

> 
> #git checkout efdb84b74e983be9e0cab7aeb9f732c67e1b0c02warning: You appear to 
> be on a branch yet to be born.
> warning: Forcing checkout of efdb84b74e983be9e0cab7aeb9f732c67e1b0c02.
> Note: moving to "efdb84b74e983be9e0cab7aeb9f732c67e1b0c02" which isn't a local 
> branch
> If you want to create a new branch from this checkout, you may do so
> (now or later) by using -b with the checkout command again. Example:
>   git checkout -b <new_branch_name>
> HEAD is now at efdb84b... import libfsotransport
> 
> libfso-transport is there, but its revision-history (and me too) seems to be 
> lost.

I think what you need to do here is 
echo efdb84b74e983be9e0cab7aeb9f732c67e1b0c02 .git/refs/heads/libfsotransport
and then "git checkout libfsotransport".

Oh, and BTW, when you later just merge from the all-in-one-branch, you
don’t have to do that again, but you have to specify "git merge -s
subtree".

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata at debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata at joachim-breitner.de | http://people.debian.org/~nomeata
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
URL: <http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090428/4794c7d3/attachment.pgp>