1. 17 Sep, 2013 1 commit
    • No such thing as an orphan branch · 605da51a
      Unfortunately git-core uses the term "unborn branch" and "orphan
      branch" interchangeably. However, "orphan" is only really there for
      the checkout command, which has the `--orphan` option so it doesn't
      actually create the branch.
      
      Branches never have parents, so the distinction of a branch with no
      parents is odd to begin with. Crucially, the error messages deal with
      unborn branches, so let's use that.
      Carlos Martín Nieto committed
  2. 12 Jan, 2013 1 commit
  3. 04 Jan, 2013 2 commits
    • Fix checkout bug rmv untracked trees from index · d8889d2b
      When checking out with the GIT_CHECKOUT_REMOVE_UNTRACKED option
      and there was an entire tree in the working directory and in the
      index that is not in the baseline nor target commit, the tree was
      correctly(?) removed from the working directory but was not
      successfully removed from the index.  This fixes that and adds a
      test of the functionality.
      Russell Belfer committed
    • Rework checkout internals (again) · cf208031
      I've tried to map out the detailed behaviors of checkout and make
      sure that we're handling the various cases correctly, along with
      providing options to allow us to emulate "git checkout" and "git
      checkout-index" with the various flags.  I've thrown away flags
      in the checkout API that seemed like clutter and added some new
      ones.  Also, I've converted the conflict callback to a general
      notification callback so we can emulate "git checkout" output and
      display "dirty" files.
      
      As of this commit, the new behavior is not working 100% but some
      of that is probably baked into tests that are not testing the
      right thing.  This is a decent snapshot point, I think, along the
      way to getting the update done.
      Russell Belfer committed
  4. 20 Oct, 2012 2 commits
  5. 19 Oct, 2012 1 commit