Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ruby-git/ruby-git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.9.1
Choose a base ref
...
head repository: ruby-git/ruby-git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.10.0
Choose a head ref
  • 7 commits
  • 10 files changed
  • 6 contributors

Commits on Dec 17, 2021

  1. Require pathname module (#536)

    ... otherwise the test fails with:
    
    TestWorktree:
      test_worktree_add_and_remove:				.: (0.080734)
      test_worktree_prune:					.: (0.055268)
      test_worktrees_all:					.: (0.037409)
      test_worktrees_single:				E
    ===============================================================================
    Error: test_worktrees_single(TestWorktree): NameError: uninitialized constant TestWorktree::Pathname
    /<<PKGBUILDDIR>>/tests/units/test_worktree.rb:51:in `test_worktrees_single'
         48:
         49:   def test_worktrees_single
         50:     worktree = @git.worktrees.first
      => 51:     git_dir = Pathname.new(@git.dir.to_s).realpath.to_s
         52:     assert_equal(worktree.dir, git_dir)
         53:     assert_equal(worktree.gcommit, SAMPLE_LAST_COMMIT)
         54:   end
    ===============================================================================
    : (0.041215)
    
    Signed-off-by: Daniel Leidert <daniel.leidert@wgdd.de>
    dleidert authored Dec 17, 2021
    Configuration menu
    Copy the full SHA
    1023f85 View commit details
    Browse the repository at this point in the history
  2. Add support for the git merge --no-commit argument (#538)

    Docs at:
    https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---no-commit
    
    Signed-off-by: Jon Dufresne <jon.dufresne@gmail.com>
    jdufresne authored Dec 17, 2021
    Configuration menu
    Copy the full SHA
    ff98c42 View commit details
    Browse the repository at this point in the history
  3. Add support for git init --initial-branch=main argument (#539)

    Signed-off-by: Jon Dufresne <jon.dufresne@gmail.com>
    jdufresne authored Dec 17, 2021
    Configuration menu
    Copy the full SHA
    6cba37e View commit details
    Browse the repository at this point in the history
  4. #533 Add --depth options for fetch call (#534)

    Signed-off-by: Alexande B <abobrikovich@gmail.com>
    CAMOBAP authored Dec 17, 2021
    Configuration menu
    Copy the full SHA
    984ff7f View commit details
    Browse the repository at this point in the history
  5. Add -ff option to git clean (#529)

    Git will refuse to modify untracked nested git repositories
    (directories with a .git subdirectory) unless a second -f is given.
    
    This adds the ability to pass "-ff" to git clean to enable removing
    directories with a .git subdirectory.
    
    An example use case is when a gem from a git source is cached in
    vendor/cache/some_gem
    Removing this with "git clean" would require "git clean -dff"
    
    Signed-off-by: Cameron Walsh <cameron.walsh@gmail.com>
    cwalsh authored Dec 17, 2021
    Configuration menu
    Copy the full SHA
    3884314 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Refactor directory initialization (#544)

    Signed-off-by: James Couball <jcouball@yahoo.com>
    jcouball authored Dec 20, 2021
    Configuration menu
    Copy the full SHA
    8feb4ff View commit details
    Browse the repository at this point in the history
  2. Release v1.10.0 (#545)

    Signed-off-by: James Couball <couballj@verizonmedia.com>
    
    Co-authored-by: James Couball <couballj@verizonmedia.com>
    jcouball and James Couball authored Dec 20, 2021
    Configuration menu
    Copy the full SHA
    8acec7d View commit details
    Browse the repository at this point in the history
Loading