1. 29 Jun, 2018 1 commit
    • stash: use _an_ index not _the_ index · 4919e495
      Don't manipulate the repository's index during stash; instead,
      manipulate a temporary index and check it out.
      
      This allows us to use the checkout mechanism to update the workdir and
      the repository's index, and allows checkout to use its common mechanisms
      to write data and handle errors.
      Edward Thomson committed
  2. 10 Jun, 2018 1 commit
  3. 26 Mar, 2018 1 commit
  4. 03 Jul, 2017 1 commit
    • Make sure to always include "common.h" first · 0c7f49dd
      Next to including several files, our "common.h" header also declares
      various macros which are then used throughout the project. As such, we
      have to make sure to always include this file first in all
      implementation files. Otherwise, we might encounter problems or even
      silent behavioural differences due to macros or defines not being
      defined as they should be. So in fact, our header and implementation
      files should make sure to always include "common.h" first.
      
      This commit does so by establishing a common include pattern. Header
      files inside of "src" will now always include "common.h" as its first
      other file, separated by a newline from all the other includes to make
      it stand out as special. There are two cases for the implementation
      files. If they do have a matching header file, they will always include
      this one first, leading to "common.h" being transitively included as
      first file. If they do not have a matching header file, they instead
      include "common.h" as first file themselves.
      
      This fixes the outlined problems and will become our standard practice
      for header and source files inside of the "src/" from now on.
      Patrick Steinhardt committed
  5. 29 Dec, 2016 1 commit
  6. 26 May, 2016 1 commit
  7. 11 Feb, 2016 1 commit
  8. 28 Aug, 2015 1 commit
  9. 12 Jul, 2015 1 commit
  10. 29 Jun, 2015 1 commit
  11. 25 Jun, 2015 2 commits
  12. 23 Jun, 2015 1 commit
    • stash: save the workdir file when deleted in index · 90177111
      When stashing the workdir tree, examine the index as well.  Using
      a mechanism similar to `git_diff_tree_to_workdir_with_index`
      allows us to determine that a file was added in the index and
      subsequently modified in the working directory.  Without examining
      the index, we would erroneously believe that this file was
      untracked and fail to include it in the working directory tree.
      
      Use a slightly modified `git_diff_tree_to_workdir_with_index` in
      order to avoid some of the behavior custom to `git diff`.  In
      particular, be sure to include the working directory side of a
      file when it was deleted in the index.
      Edward Thomson committed
  13. 21 Jun, 2015 1 commit
  14. 29 May, 2015 1 commit
    • Rename GIT_EMERGECONFLICT to GIT_ECONFLICT · 885b94aa
      We do not error on "merge conflicts"; on the contrary, merge conflicts
      are a normal part of merging.  We only error on "checkout conflicts",
      where a change exists in the index or the working directory that would
      otherwise be overwritten by performing the checkout.
      
      This *may* happen during merge (after the production of the new index
      that we're going to checkout) but it could happen during any checkout.
      Edward Thomson committed
  15. 13 May, 2015 1 commit
  16. 11 May, 2015 10 commits
  17. 03 Mar, 2015 1 commit
    • Remove the signature from ref-modifying functions · 659cf202
      The signature for the reflog is not something which changes
      dynamically. Almost all uses will be NULL, since we want for the
      repository's default identity to be used, making it noise.
      
      In order to allow for changing the identity, we instead provide
      git_repository_set_ident() and git_repository_ident() which allow a user
      to override the choice of signature.
      Carlos Martín Nieto committed
  18. 18 Feb, 2015 1 commit
  19. 09 Oct, 2014 1 commit
  20. 30 Sep, 2014 1 commit
    • stash: use a transaction to modify the reflog · f99ca523
      The stash is implemented as the refs/stash reference and its reflog. In
      order to modify the reflog, we need avoid races by making sure we're the
      only ones allowed to modify the reflog.
      
      We achieve this via the transactions API. Locking the reference gives us
      exclusive write access, letting us modify and write it without races.
      Carlos Martín Nieto committed
  21. 26 Sep, 2014 1 commit
  22. 02 Sep, 2014 1 commit
  23. 22 Apr, 2014 1 commit
    • Make stash and checkout ignore contained repos · 24d17de2
      To emulate git, stash should not remove untracked git repositories
      inside the parent repo, and checkout's REMOVE_UNTRACKED should
      also skip over these items.
      
      `git stash` actually prints a warning message for these items.
      That should be possible with a checkout notify callback if you
      wanted to, although it would require a bit of extra logic as things
      are at the moment.
      Russell Belfer committed
  24. 06 Mar, 2014 1 commit
  25. 04 Mar, 2014 1 commit
  26. 15 Jan, 2014 1 commit
  27. 11 Dec, 2013 4 commits
    • Some callback error check style cleanups · c7b3e1b3
      I find this easier to read...
      Russell Belfer committed
    • Remove converting user error to GIT_EUSER · 25e0b157
      This changes the behavior of callbacks so that the callback error
      code is not converted into GIT_EUSER and instead we propagate the
      return value through to the caller.  Instead of using the
      giterr_capture and giterr_restore functions, we now rely on all
      functions to pass back the return value from a callback.
      
      To avoid having a return value with no error message, the user
      can call the public giterr_set_str or some such function to set
      an error message.  There is a new helper 'giterr_set_callback'
      that functions can invoke after making a callback which ensures
      that some error message was set in case the callback did not set
      one.
      
      In places where the sign of the callback return value is
      meaningful (e.g. positive to skip, negative to abort), only the
      negative values are returned back to the caller, obviously, since
      the other values allow for continuing the loop.
      
      The hardest parts of this were in the checkout code where positive
      return values were overloaded as meaningful values for checkout.
      I fixed this by adding an output parameter to many of the internal
      checkout functions and removing the overload.  This added some
      code, but it is probably a better implementation.
      
      There is some funkiness in the network code where user provided
      callbacks could be returning a positive or a negative value and
      we want to rely on that to cancel the loop.  There are still a
      couple places where an user error might get turned into GIT_EUSER
      there, I think, though none exercised by the tests.
      Russell Belfer committed
    • Further EUSER and error propagation fixes · dab89f9b
      This continues auditing all the places where GIT_EUSER is being
      returned and making sure to clear any existing error using the
      new giterr_user_cancel helper.  As a result, places that relied
      on intercepting GIT_EUSER but having the old error preserved also
      needed to be cleaned up to correctly stash and then retrieve the
      actual error.
      
      Additionally, as I encountered places where error codes were not
      being propagated correctly, I tried to fix them up.  A number of
      those fixes are included in the this commit as well.
      Russell Belfer committed