1. 29 Aug, 2021 2 commits
  2. 27 Nov, 2020 1 commit
  3. 09 Jun, 2020 1 commit
    • tree-wide: do not compile deprecated functions with hard deprecation · c6184f0c
      When compiling libgit2 with -DDEPRECATE_HARD, we add a preprocessor
      definition `GIT_DEPRECATE_HARD` which causes the "git2/deprecated.h"
      header to be empty. As a result, no function declarations are made
      available to callers, but the implementations are still available to
      link against. This has the problem that function declarations also
      aren't visible to the implementations, meaning that the symbol's
      visibility will not be set up correctly. As a result, the resulting
      library may not expose those deprecated symbols at all on some platforms
      and thus cause linking errors.
      
      Fix the issue by conditionally compiling deprecated functions, only.
      While it becomes impossible to link against such a library in case one
      uses deprecated functions, distributors of libgit2 aren't expected to
      pass -DDEPRECATE_HARD anyway. Instead, users of libgit2 should manually
      define GIT_DEPRECATE_HARD to hide deprecated functions. Using "real"
      hard deprecation still makes sense in the context of CI to test we don't
      use deprecated symbols ourselves and in case a dependant uses libgit2 in
      a vendored way and knows it won't ever use any of the deprecated symbols
      anyway.
      Patrick Steinhardt committed
  4. 18 Jan, 2020 1 commit
  5. 02 Jul, 2019 2 commits
  6. 24 Jun, 2019 1 commit
  7. 14 Jun, 2019 1 commit
    • Rename opt init functions to `options_init` · 0b5ba0d7
      In libgit2 nomenclature, when we need to verb a direct object, we name
      a function `git_directobject_verb`.  Thus, if we need to init an options
      structure named `git_foo_options`, then the name of the function that
      does that should be `git_foo_options_init`.
      
      The previous names of `git_foo_init_options` is close - it _sounds_ as
      if it's initializing the options of a `foo`, but in fact
      `git_foo_options` is its own noun that should be respected.
      
      Deprecate the old names; they'll now call directly to the new ones.
      Edward Thomson committed
  8. 21 Apr, 2019 1 commit
    • rebase: orig_head and onto accessors · e215f475
      The rebase struct stores fields with information about the current
      rebase process, which were not accessible via a public interface.
      
      Accessors for getting the `orig_head` and `onto` branch
      names and object ids have been added.
      Erik Aigner committed
  9. 21 Feb, 2019 1 commit
  10. 20 Feb, 2019 1 commit
  11. 24 Jan, 2019 3 commits
    • fixup: More generic signing_cb for future flexibility · 0d06bf48
      In the case that we want to build merge + commit, cherrypick + commit, or even just build a commit with signing callback, `git_rebase_commit_signature_cb` particular callback should be made more generic. We also renamed `signature_cb` to `signing_cb` to improve clarity on the purpose of the callback (build a difference between a git_signature and the act of signing).
      
      So we've ended up with `git_commit_signing_cb`.
      Tyler Wanek committed
    • Single callback for commit signing in rebase w/ git_buf · 578cc029
      Reduces the number of callbacks for signing a commit during a rebase operation to just one callback. That callback has 2 out git_buf parameters for signature and signature field. We use git_buf here, because we cannot make any assumptions about the heap allocator a user of the library might be using.
      Tyler Wanek committed
    • Add signing callbacks for git_rebase_commit in git_rebase_options · 546e40c9
      2 callbacks have been added to git_rebase_options, git_rebase_commit_signature_cb and git_rebase_commit_signature_field_cb. When git_rebase_commit_signature_cb is present in git_rebase_options, it will be called whenever git_rebase_commit is performed, giving an opportunity to sign the commit. The signing procedure can be skipped if the callback specifies passthrough as the error. The git_rebase_commit_signature_field_cb will only be called if the other callback is present or did not passthrough, and it provides means to specify which field a signature is for.
      Git_rebase_options was chosen as the home for these callbacks as it keeps backwards compatibility with the current rebase api.
      Tyler Wanek committed
  12. 22 Jan, 2019 1 commit
  13. 01 Dec, 2018 1 commit
  14. 18 Oct, 2018 1 commit
  15. 10 Jun, 2018 1 commit
  16. 26 Mar, 2018 1 commit
  17. 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
  18. 03 Mar, 2017 1 commit
    • rebase: ignore untracked files in submodules · 2270ca9f
      An untracked file in a submodule should not prevent a rebase from
      starting.  Even if the submodule's SHA is changed, and that file would
      conflict with a new tracked file, it's still OK to start the rebase
      and discover the conflict later.
      
      Signed-off-by: David Turner <dturner@twosigma.com>
      David Turner committed
  19. 28 Feb, 2017 1 commit
  20. 13 Feb, 2017 1 commit
    • repository: rename `path_repository` and `path_gitlink` · 84f56cb0
      The `path_repository` variable is actually confusing to think
      about, as it is not always clear what the repository actually is.
      It may either be the path to the folder containing worktree and
      .git directory, the path to .git itself, a worktree or something
      entirely different. Actually, the intent of the variable is to
      hold the path to the gitdir, which is either the .git directory
      or the bare repository.
      
      Rename the variable to `gitdir` to avoid confusion. While at it,
      also rename `path_gitlink` to `gitlink` to improve consistency.
      Patrick Steinhardt committed
  21. 29 Dec, 2016 2 commits
  22. 02 Dec, 2016 1 commit
    • git_rebase_init: correctly handle detached HEAD · 4db1fc7e
      git_rebase_finish relies on head_detached being set, but
      rebase_init_merge was only setting it when branch->ref_name was unset.
      But branch->ref_name would be set to "HEAD" in the case of detached
      HEAD being either implicitly (NULL) or explicitly passed to
      git_rebase_init.
      David Turner committed
  23. 06 Oct, 2016 1 commit
  24. 01 Jun, 2016 1 commit
    • rebase: change assertion to avoid · 4505a42a
      It looks like we're getting the operation and not doing anything
      with it, when in fact we are asserting that it's not null.  Simply
      assert that we are within the operation boundary instead of using
      the `git_array_get` macro to do this for us.
      Edward Thomson committed
  25. 03 May, 2016 1 commit
  26. 21 Apr, 2016 2 commits
  27. 23 Feb, 2016 1 commit
  28. 15 Feb, 2016 1 commit
  29. 11 Feb, 2016 2 commits
    • rebase: allow custom merge_options · a202e0d4
      Allow callers of rebase to specify custom merge options.  This may
      allow custom conflict resolution, or failing fast when conflicts
      are detected.
      Edward Thomson committed
    • rebase: introduce inmemory rebasing · ee667307
      Introduce the ability to rebase in-memory or in a bare repository.
      
      When `rebase_options.inmemory` is specified, the resultant `git_rebase`
      session will not be persisted to disk.  Callers may still analyze
      the rebase operations, resolve any conflicts against the in-memory
      index and create the commits.  Neither `HEAD` nor the working
      directory will be updated during this process.
      Edward Thomson committed
  30. 12 Jul, 2015 1 commit
  31. 09 Jun, 2015 1 commit
  32. 20 Apr, 2015 2 commits