Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repository.xs: Allow branches() to return a specific type of branch #85

Merged
merged 31 commits into from
Apr 25, 2014
Merged

Repository.xs: Allow branches() to return a specific type of branch #85

merged 31 commits into from
Apr 25, 2014

Conversation

jacquesg
Copy link
Owner

Also updated libgit2 (they have fixed some bugs in terms of ignores).
Fixed a documentation error in Repository.pm.
Check the type passed to Git::Raw::Repository -> workdir().

jacquesg and others added 30 commits April 14, 2014 10:35
 - Fix segfaults caused by invalid object creation (GH#66) (thanks, @pipcet!)
 - Add Config -> default() method (GH#67) (thanks, @magnolia-k!)
 - Do not fail when a lightweight tag is found in the Tag->foreach() callback
   (GH#68) (thanks, @pipcet!)
 - Add Tree::Entry -> file_mode() method (GH#69) (thanks, @pipcet!)
 - Repository -> merge() now takes %merge_opts and %checkout_opts as 2
   separate parameters. (incompatible change) (GH#70)
 - Merge options parameter member 'automerge' has been renamed to 'favor',
   inline with libgit2 API changes. (incompatible changes) (GH#70)
   It has also learned about a 'union' merge.
 - Checkout options has learned new options: 'target_directory', 'ancestor_label',
   'our_label' and 'their_label'. (GH#70)
 - Checkout strategy has additional options: (GH#70)
   'use_ours', 'use_theirs', 'skip_locked_directories', 'dont_overwrite_ignored',
   'conflict_style_merge', 'conflict_style_diff3' and 'disable_pathspec_match'.
 - Added new Repository methods (#GH70):
    + Repository -> merge_analysis()
    + Repository -> merge_base()
 - Added new Index methods (#GH70):
    + Index -> write_tree_to()
    + Index -> checkout()
    + Index -> entries()
    + Index -> add_conflict()
    + Index -> remove_conflict()
 - Added new Commit method (#GH70):
    + Commit -> merge()
 - Added new Tree method (#GH70):
    + Tree -> merge()
 - Index -> add() now either takes a path or a Index::Entry (GH#70)
 - Remote->create_inmemory() has been replaced by Remote->create_anonymous()
   (incompatible change) (GH#71).
   The order of 'url' and 'fetchspec' has also been reversed to bring it
   inline with the upstream changes.
 - Update libgit2 to bcc6229
Ideally we want the use to be able to specify the location of the
library when running `perl Makefile.PL` if required.
@jacquesg
Copy link
Owner Author

Test case failure is also one of the "off by one second" ones:

#   Failed test at t/08-branch.t line 56.
#          got: '1398180106'
#     expected: '1398180107'
#   Failed test at t/08-branch.t line 62.
#          got: '1398180106'
#     expected: '1398180107'

@ghedo
Copy link
Collaborator

ghedo commented Apr 22, 2014

I restarted the test run and it's good now.

@jacquesg
Copy link
Owner Author

Cool.

@jacquesg jacquesg merged commit db9b385 into jacquesg:master Apr 25, 2014
jacquesg added a commit that referenced this pull request Apr 25, 2014
@jacquesg jacquesg deleted the branch-granularity branch April 25, 2014 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants