How do I Re-root a git repo to a parent folder while preserving history?

by

What you want is git filter-branch, which can move a whole repository into a subtree, preserving history by making it look as if it’s always been that way. Back up your repository before using this!

Here’s the magic. In /foo/bar, run:

git filter-branch --commit-filter '
    TREE="$1";
    shift;
    SUBTREE=`echo -e 040000 tree $TREE"\tbar" | git mktree`
    git commit-tree $SUBTREE "$@"' -- --all

That will make the /foo/bar repository have another ‘bar’ subdirectory with all its contents throughout its whole history. Then you can move the entire repo up to the foo level and add baz code to it.

Update:

Okay, here’s what’s going on. A commit is a link to a “tree” (think of it as a SHA representing a whole filesystem subdirectory’s contents) plus some “parent” SHA’s and some metadata link author/message/etc. The git commit-tree command is the low-level bit that wraps all this together. The parameter to --commit-filter gets treated as a shell function and run in place of git commit-tree during the filter process, and has to act like it.

What I’m doing is taking the first parameter, the original tree to commit, and building a new “tree object” that says it’s in a subfolder via git mktree, another low-level git command. To do that, I have to pipe into it something that looks like a git tree i.e. a set of (mode SP type SP SHA TAB filename) lines; thus the echo command. The output of mktree is then substituted for the first parameter when I chain to the real commit-tree; "$@" is a way to pass all the other parameters intact, having stripped the first off with shift. See git help mktree and git help commit-tree for info.

So, if you need multiple levels, you have to nest a few extra levels of tree objects (this isn’t tested but is the general idea):

git filter-branch --commit-filter '
    TREE="$1"
    shift
    SUBTREE1=`echo -e 040000 tree $TREE"\tbar" | git mktree`
    SUBTREE2=`echo -e 040000 tree $SUBTREE1"\tb" | git mktree`
    SUBTREE3=`echo -e 040000 tree $SUBTREE2"\ta" | git mktree`
    git commit-tree $SUBTREE3 "$@"' -- --all

That should shift the real contents down into a/b/bar (note the reversed order).

Update: Integrated improvements From Matthew Alpert’s answer below. Without -- --all this only works on the currently-checked out branch, but since the question is asking about a whole repo, it makes more sense to do it this way than branch-by-branch.

More Related Contents:

  1. Git submodule update
  2. In Git, how can I recover a staged file that was reverted prior to committing?
  3. How to resolve “Error: bad index – Fatal: index file corrupt” when using Git
  4. How to restrict access to the master branch in Git
  5. Push local Git repo to new remote including all branches and tags
  6. How do I “git clone” a repo, including its submodules?
  7. I ran into a merge conflict. How do I abort the merge?
  8. How do I prompt the user from within a commit-msg hook?
  9. Move initial commits off master to another branch in Git
  10. How to make Git pull use rebase by default for all my repositories?
  11. How do I get bash completion to work with aliases?
  12. How do I get my ‘Detached HEAD’ commits back into master [duplicate]
  13. Fix msysGit Portable $HOME location
  14. Get changes from master into branch in Git
  15. Git Commit Messages: 50/72 Formatting
  16. How to compare two tags with git?
  17. fatal: This operation must be run in a work tree [duplicate]
  18. How git works when two peers push changes to same remote simultaneously
  19. Rebase feature branch onto another feature branch
  20. Using a socks proxy with git for the http transport
  21. How to extract a git subdirectory and make a submodule out of it?
  22. How do you change the capitalization of filenames in Git?
  23. Tell git not to merge binary files but to choose
  24. How to make git diff –ignore-space-change the default
  25. Set git config values for all child folders
  26. How to push changes to github after jenkins build completes?
  27. Refname ‘master’ is ambiguous
  28. How can I prevent non-fastforward pushes to selected branch(es) in git?
  29. Commit empty folder structure (with git) [duplicate]
  30. when you have secret key in your project, how can pushing to GitHub be possible?

Leave a Comment