summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* push: use the common refspec parsercmn/push-refspec-refactorCarlos Martín Nieto2014-11-097-73/+45
| | | | | | | | | | | There is one well-known and well-tested parser which we should use, instead of implementing parsing a second time. The common parser is also augmented to copy the LHS into the RHS if the latter is empty. The expressions test had to change a bit, as we now catch a bad RHS of a refspec locally.
* Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-052-1/+42
|\ | | | | ignore: consider files with a CR in their names
| * ignore: consider files with a CR in their namescmn/ignore-file-trailing-crCarlos Martín Nieto2014-11-052-1/+42
| | | | | | | | | | | | | | | | | | | | We currently consider CR to start the end of the line, but that means that we miss cases with CR CR LF which can be used with git to match files whose names have CR at the end of their names. The fix from the patch comes from Russell's comment in the issue. This fixes #2536.
* | Merge pull request #2686 from ethomson/rename_notfoundCarlos Martín Nieto2014-11-032-1/+10
|\ \ | | | | | | Propogate GIT_ENOTFOUND from git_remote_rename
| * | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-032-1/+10
|/ /
* | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-032-6/+28
|\ \ | | | | | | Make config reading continue after hitting a missing include file.
| * | Clean up issues include.path issues found during code review.John Fultz2014-11-022-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | * Error-handling is cleaned up to only let a file-not-found error through, not other sorts of errors. And when a file-not-found error happens, we clean up the error. * Test now checks that file-not-found introduces no error. And other minor cleanups.
| * | Make config reading continue after hitting a missing include file.John Fultz2014-11-012-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, if you have [include] path = foo and foo didn't exist, git_config_open_ondisk() would just give up on the rest of the file. Now it ignores the unresolved include without error and continues reading the rest of the file.
* | | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-033-3/+8
|\ \ \ | |_|/ |/| | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
| * | Changed context_lines and interhunk_lines to uint32_t to match struct ↵Pierre-Olivier Latour2014-10-273-3/+8
| | | | | | | | | | | | s_xdemitconf
* | | Merge pull request #2683 from libgit2/cmn/remote-unifyEdward Thomson2014-11-031-21/+2
|\ \ \ | | | | | | | | remote: unify the creation code
| * | | remote: unify the creation codecmn/remote-unifyCarlos Martín Nieto2014-11-021-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | The create function with default refspec is the same as the one with a custom refspec, but it has the default refspec, so we can create the one on top of the other.
* | | | Merge pull request #2680 from libgit2/cmn/invalid-cert-returnEdward Thomson2014-11-031-1/+1
|\ \ \ \ | | | | | | | | | | netops: return GIT_ECERTIFICATE when it fails the basic tests
| * | | | netops: return GIT_ECERTIFICATE when it fails the basic testscmn/invalid-cert-returnCarlos Martín Nieto2014-11-021-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When we first ask OpenSSL to verify the certfiicate itself (rather than the HTTPS specifics), we should also return GIT_ECERTIFICATE. Otherwise, the caller would consider this as a failed operation rather than a failed validation and not call the user's own validation.
* | | | Merge pull request #2685 from libgit2/cmn/mmap-readableEdward Thomson2014-11-031-4/+2
|\ \ \ \ | | | | | | | | | | Fix segmentation fault observed on OpenBSD/sparc64
| * | | | Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readableStefan Sperling2014-11-031-4/+2
| | |/ / | |/| | | | | | | | | | | | | | A non-readable mapping of a file causes an access violation in the pack tests. Always use PROT_READ to work around this.
* | | | Merge pull request #2684 from jacquesg/openssl-windowsEdward Thomson2014-11-031-7/+8
|\ \ \ \ | |/ / / |/| | | Make the Visual Studio compiler happy
| * | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ / /
* | | remote: fix tagopt testCarlos Martín Nieto2014-11-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An anonymous remote wouldn't create remote-tracking branches, so testing we don't create them for TAGS_ALL is nonsensical. Furthermore, the name of the supposed remote-tracking branch was also not one which would have been created had it had a name. Give the remote a name and test that we only create the tags when we pass TAGS_ALL and that we do create the remote-branch branch when given TAGS_AUTO.
* | | merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
|/ / | | | | | | | | Since it's not necessarily obvious, mention the merging state and how to clear it.
* | Merge pull request #2669 from ethomson/revert_test_fixEdward Thomson2014-10-2713-12/+8
|\ \ | | | | | | revert tests: always use core.autocrlf=false in tests
| * | revert tests: always use core.autocrlf=false in testsEdward Thomson2014-10-2713-12/+8
|/ /
* | Merge pull request #2659 from swisspol/static_analysisEdward Thomson2014-10-275-8/+3
|\ \ | |/ |/| Fixed the most obvious Clang static analyzer warnings
| * Fixed potential crash with uninitialized variablesPierre-Olivier Latour2014-10-272-2/+2
| |
| * Removed some useless variable assignmentsPierre-Olivier Latour2014-10-274-6/+1
|/
* Merge pull request #2666 from libgit2/cmn/threadsafe-onEdward Thomson2014-10-273-2/+5
|\ | | | | Flip THREADSAFE's default to ON
| * Flip THREADSAFE's default to ONcmn/threadsafe-onCarlos Martín Nieto2014-10-273-2/+5
| | | | | | | | | | | | Threads are here to stay; and for a while now, users have had to call the initialization function which sets up threads and crypto regardless of whether the library was built threadsafe or not.
* | Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2Carlos Martín Nieto2014-10-278-24/+29
|\ \ | |/ |/|
| * Fix compiler warning (git_off_t cast to size_t).Albert Meltzer2014-05-198-24/+29
| | | | | | | | | | | | Use size_t for page size, instead of long. Check result of sysconf. Use size_t for page offset so no cast to size_t (second arg to p_mmap). Use mod instead div/mult pair, so no cast to size_t is necessary.
* | Merge branch 'csware/cleanup'Edward Thomson2014-10-261-8/+6
|\ \
| * | Minor cleanup: Use defined no_check_cert_flags instead of C&P them againSven Strickroth2014-10-261-8/+6
|/ / | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Merge pull request #2482 from libgit2/ed/rebaseEdward Thomson2014-10-26169-566/+3381
|\ \ | | | | | | Rebase (merge)
| * | rebase: add information to the CHANGELOGed/rebaseEdward Thomson2014-10-261-0/+14
| | |
| * | rebase: updates based on PR commentsEdward Thomson2014-10-263-34/+47
| | |
| * | s/git_merge_head/git_annotated_commitEdward Thomson2014-10-2621-631/+700
| | | | | | | | | | | | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
| * | rebase: clean up some warnings and memory leaksEdward Thomson2014-10-262-26/+15
| | |
| * | rebase: oid member of operation should be constEdward Thomson2014-10-262-3/+3
| | |
| * | git_rebase: iterators for operationsEdward Thomson2014-10-263-0/+156
| | |
| * | rebase: preload all operationsEdward Thomson2014-10-263-125/+165
| | |
| * | rebase: init/open a git_rebase objectEdward Thomson2014-10-266-295/+398
| | |
| * | git_rebase_next: provide info about the operationEdward Thomson2014-10-263-25/+111
| | |
| * | git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-263-18/+255
| | |
| * | Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-263-4/+51
| | |
| * | git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-265-35/+67
| | |
| * | Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-263-1/+131
| | |
| * | git_rebase_next: test that we return GIT_ITEROVEREdward Thomson2014-10-261-0/+50
| | |
| * | git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-2614-5/+62
| | | | | | | | | | | | | | | | | | Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
| * | Introduce git_rebase_commitEdward Thomson2014-10-265-11/+241
| | | | | | | | | | | | Commit the current patch of a rebase process.
| * | git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-262-18/+161
| | |
| * | Introduce git_rebase_nextEdward Thomson2014-10-263-0/+228
| | | | | | | | | | | | | | | | | | `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.
View Lorry Controller Status