Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>What you want is <code>git filter-branch</code>, 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!</p> <p>Here's the magic. In <code>/foo/bar</code>, run:</p> <pre><code>git filter-branch --commit-filter ' TREE="$1"; shift; SUBTREE=`echo -e 040000 tree $TREE"\tbar" | git mktree` git commit-tree $SUBTREE "$@"' -- --all </code></pre> <p>That will make the <code>/foo/bar</code> repository have another 'bar' subdirectory with all its contents throughout its whole history. Then you can move the entire repo up to the <code>foo</code> level and add <code>baz</code> code to it.</p> <p><em>Update</em>:</p> <p>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 <code>git commit-tree</code> command is the low-level bit that wraps all this together. The parameter to <code>--commit-filter</code> gets treated as a shell function and run in place of <code>git commit-tree</code> during the filter process, and has to act like it.</p> <p>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 <code>git mktree</code>, 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 <code>mktree</code> is then substituted for the first parameter when I chain to the real <code>commit-tree</code>; <code>"$@"</code> is a way to pass all the other parameters intact, having stripped the first off with <code>shift</code>. See <code>git help mktree</code> and <code>git help commit-tree</code> for info.</p> <p>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):</p> <pre><code>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 </code></pre> <p>That should shift the real contents down into <code>a/b/bar</code> (note the reversed order).</p> <p><strong>Update</strong>: Integrated improvements From Matthew Alpert's answer below. Without <code>-- --all</code> 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.</p>
    singulars
    1. This table or related slice is empty.
    1. POHow do I Re-root a git repo to a parent folder while preserving history?
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USJustin Ohms
    1. USWalter Mundt
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POHow do I Re-root a git repo to a parent folder while preserving history?
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COHi, I ran into a snag by oversimplifying the situation. The repo I want to move to /foo is not /foo/bar; it is actually /foo/a/b/bar. I think the basic idea behind your approach still works, but I can't rewrite a nested path: git filter-branch --commit-filter ' TREE="$1"; shift; SUBTREE=`echo -e 040000 tree $TREE"\ta/b/bar" | git mktree` git commit-tree $SUBTREE "$@"' Rewrite 27814f8d447ca9a4b61ed17a33912bee41e2e00e (1/68)fatal: path a/b/bar contains slash Also, I can't figure out what your script does...could you explain? Thanks for your help so far.
      singulars
      1. PO
      1. USmasonk
    2. COI figured it out. Nope, nevermind, I didn't figure it out.
      singulars
      1. PO
      1. USmasonk
    3. COIn particular, I don't understand this part: tree $TREE"\tbar" As I am interpreting the filter-branch manpage, $TREE should hold a SHA1 commit (I'm assuming that's what TREE_ID is, though I've never seen "ID" anywhere else in git terminology). The bash command tree "<SHA1>\tfoldername" does not yield a tree. Thus we're not piping anything useful into git-mktree.
      singulars
      1. PO
      1. USmasonk
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload