Skip to content
Commits on Apr 30, 2012
  1. @rentzsch

    [TEST] Add subtree and immediately push.

    rentzsch committed
    Passes on current (2793ee6) apenwarr and current (29922dd) rentzsch forks.
    Fails on current (3dc509b) helmo fork.
  2. @rentzsch
Commits on Nov 5, 2010
  1. Add from-submodule.

    Peter Jaros committed with Peter Jaros
Commits on May 20, 2010
  1. @voxpelli

    Fixed regression with splitting out new subtree

    voxpelli committed
    A folder in a repository that wasn't initially imported as a  subtree could no longer be splitted into an entirely new subtree with no parent.
    
    A fix and a new test to fix that regression is added here.
Commits on Feb 9, 2010
  1. @apenwarr

    Some recent tests accidentally depended on very new versions of git.

    apenwarr committed
    The "--format" option is too new.  Use "--pretty=format:" (which means the
    same thing) instead.  Now it works again on git 1.6.0 (at least).
  2. @apenwarr

    Oops. Apparently I didn't run 'make test' after most recent change.

    apenwarr committed
    Thanks to Dan Sabath for pointing that out.
Commits on Feb 8, 2010
  1. @apenwarr

    Improve checking for existence of the --prefix directory.

    apenwarr committed
    For add, the prefix must *not* already exist.  For all the other commands,
    it *must* already exist.
Commits on Feb 6, 2010
  1. @treese @apenwarr

    Make sure that <prefix> exists when splitting.

    treese committed with apenwarr
    And test cases for that check, as well as for an error if no prefix is
    specified at all.
Commits on Jan 12, 2010
  1. @mackuba

    added tests for recent changes

    mackuba committed
Commits on Oct 2, 2009
  1. @apenwarr

    If someone provides a --prefix that ends with slash, strip the slash.

    apenwarr committed
    Prefixes that differ only in the trailing slash should be considered
    identical.
    
    Also update the test to check that this works.
Commits on Aug 26, 2009
  1. @apenwarr

    Fix behaviour if you have a branch named the same as your --prefix

    apenwarr committed
    We were trying to 'git checkout $prefix', which is ambiguous if $prefix
    names a directory *and* a branch.  Do 'git checkout -- $prefix' instead.
    
    The main place this appeared was in 'git subtree add'.
    
    Reported by several people.
Commits on Aug 12, 2009
  1. @amiel
  2. @amiel

    fixed order of assertion in tests

    amiel committed
Commits on Apr 26, 2009
  1. @apenwarr

    test.sh: oops, never intended to count the raw number of commits.

    apenwarr committed
    Just needed to make sure the count was non-zero.
  2. @apenwarr
  3. @apenwarr

    Trim some extra merge commits that don't need to go into the split tree.

    apenwarr committed
    ...and update test.sh to test for this.
  4. @apenwarr

    test.sh tweak

    apenwarr committed
  5. @apenwarr
  6. @apenwarr
  7. @apenwarr
Commits on Apr 25, 2009
  1. @apenwarr
  2. @apenwarr

    Pass the path using the --prefix option instead of on the command line.

    apenwarr committed
    I like this better.  It's more like git-read-tree and some other commands.
  3. @apenwarr

    Okay, that was a little too aggressive.

    apenwarr committed
    Now we only prune out a commit if it has exactly one remaining parent and
    that parent's tree is identical to ours.
    
    But I also changed the test to create the initial "-s ours" merge in one
    step instead of two, and that merge can be eliminated since one of its
    parents doesn't affect the subdir at all, and is thus deleted.
  4. @apenwarr

    Even more aggressive commit trimming.

    apenwarr committed
    Now we cut out a commit if any of its parents had the same tree; just use
    that parent in its place.  This makes the history look nice, but I don't
    think it's quite right...
  5. @apenwarr
Something went wrong with that request. Please try again.