Checkout of orphan branch files into mainline worktree

Checkout of orphan branch files into mainline worktree

[Gianluca Pacchiella]

Hi folks,

I have a repository where I maintain a project for a web site with a branch
(disconnected from the mainline history) that contains some files
(necessary only for a particular instance of a site) that don't intersect
with others files in the main project. Since I don't want to use submodule
and subtree I manage myself to this sequence of commands ("deploy" is the
branch name of the mainline history and "index" of the --orphan branch) to
checkout the index's files into the mainline files

git read-tree index && ( git ls-files --with-tree=index | git
checkout-index --stdin ) && git read-tree deploy

Are there some other ways to do this? I'm crazy? are there side effects?

Thanks,
	Gianluca

Re: Checkout of orphan branch files into mainline worktree

[Santi Béjar]

On Thu, Mar 25, 2010 at 11:39 AM, Gianluca Pacchiella
<gianluca.pacchiella@ktln2.org> wrote:
> Hi folks,
>
> I have a repository where I maintain a project for a web site with a branch
> (disconnected from the mainline history) that contains some files
> (necessary only for a particular instance of a site) that don't intersect
> with others files in the main project. Since I don't want to use submodule
> and subtree I manage myself to this sequence of commands ("deploy" is the
> branch name of the mainline history and "index" of the --orphan branch) to
> checkout the index's files into the mainline files
>
> git read-tree index && ( git ls-files --with-tree=index | git
> checkout-index --stdin ) && git read-tree deploy
>
> Are there some other ways to do this? I'm crazy? are there side effects?

I don´t know if this is a good idea in general, but you could get the
same result with:

git merge --no-commit index &&
git reset deploy

HTH,
Santi

>
> Thanks,
>        Gianluca
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>