summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ci: install homebrew's curl on macethomson/mac_buildEdward Thomson2016-07-242-1/+2
|
* ci: install homebrew's zlib on macEdward Thomson2016-07-222-0/+5
|
* Merge pull request #3851 from txdv/get-user-agentEdward Thomson2016-07-054-0/+19
|\ | | | | Add get user agent functionality.
| * Add get user agent functionality.Andrius Bentkus2016-07-054-0/+19
| |
* | Merge pull request #3846 from rkrp/fix_bug_parsing_int64minEdward Thomson2016-07-052-3/+11
|\ \ | |/ |/| Fixed bug while parsing INT64_MIN
| * Fixed bug while parsing INT64_MINKrishna Ram Prakash R2016-06-292-3/+11
| |
* | Merge pull request #3836 from joshtriplett/cleanup-find_repoEdward Thomson2016-07-011-22/+30
|\ \ | | | | | | find_repo: Clean up and simplify logic
| * | find_repo: Clean up and simplify logicJosh Triplett2016-06-241-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_repo had a complex loop and heavily nested conditionals, making it difficult to follow. Simplify this as much as possible: - Separate assignments from conditionals. - Check the complex loop condition in the only place it can change. - Break out of the loop on error, rather than going through the rest of the loop body first. - Handle error cases by immediately breaking, rather than nesting conditionals. - Free repo_link unconditionally on the way out of the function, rather than in multiple places. - Add more comments on the remaining complex steps.
* | | Merge pull request #3711 from joshtriplett/git_repository_discover_defaultEdward Thomson2016-07-015-20/+520
|\ \ \ | | | | | | | | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment vars
| * | | CHANGELOG.md: Document new flags for git_repository_open_extJosh Triplett2016-06-301-0/+19
| | | | | | | | | | | | | | | | Document GIT_REPOSITORY_OPEN_NO_DOTGIT and GIT_REPOSITORY_OPEN_FROM_ENV.
| * | | CHANGELOG.md: Document behavior change in repository discoveryJosh Triplett2016-06-301-0/+7
| |/ /
| * | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment varsJosh Triplett2016-06-243-1/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_repository_open_ext provides parameters for the start path, whether to search across filesystems, and what ceiling directories to stop at. git commands have standard environment variables and defaults for each of those, as well as various other parameters of the repository. To avoid duplicate environment variable handling in users of libgit2, add a GIT_REPOSITORY_OPEN_FROM_ENV flag, which makes git_repository_open_ext automatically handle the appropriate environment variables. Commands that intend to act just like those built into git itself can use this flag to get the expected default behavior. git_repository_open_ext with the GIT_REPOSITORY_OPEN_FROM_ENV flag respects $GIT_DIR, $GIT_DISCOVERY_ACROSS_FILESYSTEM, $GIT_CEILING_DIRECTORIES, $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and $GIT_ALTERNATE_OBJECT_DIRECTORIES. In the future, when libgit2 gets worktree support, git_repository_open_env will also respect $GIT_WORK_TREE and $GIT_COMMON_DIR; until then, git_repository_open_ext with this flag will error out if either $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
| * | Add GIT_REPOSITORY_OPEN_NO_DOTGIT flag to avoid appending /.gitJosh Triplett2016-06-243-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT_REPOSITORY_OPEN_NO_SEARCH does not search up through parent directories, but still tries the specified path both directly and with /.git appended. GIT_REPOSITORY_OPEN_BARE avoids appending /.git, but opens the repository in bare mode even if it has a working directory. To support the semantics git uses when given $GIT_DIR in the environment, provide a new GIT_REPOSITORY_OPEN_NO_DOTGIT flag to not try appending /.git.
| * | Fix repository discovery with ceiling_dirs at current directoryJosh Triplett2016-06-243-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git only checks ceiling directories when its search ascends to a parent directory. A ceiling directory matching the starting directory will not prevent git from finding a repository in the starting directory or a parent directory. libgit2 handled the former case correctly, but differed from git in the latter case: given a ceiling directory matching the starting directory, but no repository at the starting directory, libgit2 would stop the search at that point rather than finding a repository in a parent directory. Test case using git command-line tools: /tmp$ git init x Initialized empty Git repository in /tmp/x/.git/ /tmp$ cd x/ /tmp/x$ mkdir subdir /tmp/x$ cd subdir/ /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x git rev-parse --git-dir fatal: Not a git repository (or any of the parent directories): .git /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x/subdir git rev-parse --git-dir /tmp/x/.git Fix the testsuite to test this case (in one case fixing a test that depended on the current behavior), and then fix find_repo to handle this case correctly. In the process, simplify and document the logic in find_repo(): - Separate the concepts of "currently checking a .git directory" and "number of iterations left before going further counts as a search" into two separate variables, in_dot_git and min_iterations. - Move the logic to handle in_dot_git and append /.git to the top of the loop. - Only search ceiling_dirs and find ceiling_offset after running out of min_iterations; since ceiling_offset only tracks the longest matching ceiling directory, if ceiling_dirs contained both the current directory and a parent directory, this change makes find_repo stop the search at the parent directory.
* | | Merge pull request #3847 from libgit2/ethomson/read_index_conflictsEdward Thomson2016-06-304-22/+150
|\ \ \ | | | | | | | | Include conflicts in `git_index_read_index`
| * | | index: include conflicts in `git_index_read_index`ethomson/read_index_conflictsEdward Thomson2016-06-294-14/+119
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target.
| * | | index: refactor common `read_index` functionalityEdward Thomson2016-06-291-13/+36
|/ / / | | | | | | | | | | | | | | | Most of `git_index_read_index` is common to reading any iterator. Refactor it out in case we want to implement `read_tree` in terms of it in the future.
* | | Merge pull request #3813 from stinb/submodule-update-fetchEdward Thomson2016-06-292-7/+27
|\ \ \ | | | | | | | | submodule: Try to fetch when update fails to find the target commit.
| * | | submodule: Try to fetch when update fails to find the target commit in the ↵Jason Haslam2016-06-282-7/+27
| | |/ | |/| | | | | | | submodule.
* | | Merge pull request #3842 from pks-t/pks/double-freeEdward Thomson2016-06-291-8/+18
|\ \ \ | |/ / |/| | blame: increment reference count for origin's commit
| * | blame: do not decrement commit refcount in make_originPatrick Steinhardt2016-06-291-8/+18
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create a blame origin, we try to look up the blob that is to be blamed at a certain revision. When this lookup fails, e.g. because the file did not exist at that certain revision, we fail to create the blame origin and return `NULL`. The blame origin that we have just allocated is thereby free'd with `origin_decref`. The `origin_decref` function does not only decrement reference counts for the blame origin, though, but also for its commit and blob. When this is done in the error case, we will cause an uneven reference count for these objects. This may result in hard-to-debug failures at seemingly unrelated code paths, where we try to access these objects when they in fact have already been free'd. Fix the issue by refactoring `make_origin` such that we only allocate the object after the only function that may fail so that we do not have to call `origin_decref` at all. Also fix the `pass_blame` function, which indirectly calls `make_origin`, to free the commit when `make_origin` failed.
* | Merge pull request #3223 from ethomson/applyEdward Thomson2016-06-2564-2683/+7255
|\ \ | | | | | | Reading patch files
| * | patch: show copy information for identical copiesEdward Thomson2016-06-256-24/+147
| | | | | | | | | | | | | | | | | | | | | When showing copy information because we are duplicating contents, for example, when performing a `diff --find-copies-harder -M100 -B100`, then show copy from/to lines in a patch, and do not show context. Ensure that we can also parse such patches.
| * | patch::parse: test diff with exact rename and copyEdward Thomson2016-06-251-0/+5
| | |
| * | patch::parse: test diff with simple renameEdward Thomson2016-06-251-12/+27
| | |
| * | patch::parse: handle patches with no hunksEdward Thomson2016-06-251-1/+3
| | | | | | | | | | | | | | | Patches may have no hunks when there's no modifications (for example, in a rename). Handle them.
| * | diff::parse tests: test parsing a diffEdward Thomson2016-06-253-0/+107
| | | | | | | | | | | | | | | Test that we can create a diff file, then parse the results and that the two are identical in-memory.
| * | patch: zero id and abbrev length for empty filesEdward Thomson2016-05-261-8/+20
| | |
| * | patch: identify non-binary patches as `NOT_BINARY`Edward Thomson2016-05-261-4/+3
| | |
| * | Introduce `git_diff_to_buf`Edward Thomson2016-05-262-0/+24
| | | | | | | | | | | | | | | Like `git_patch_to_buf`, provide a simple helper method that can print an entire diff directory to a `git_buf`.
| * | introduce `git_diff_from_buffer` to parse diffsEdward Thomson2016-05-268-52/+250
| | | | | | | | | | | | Parse diff files into a `git_diff` structure.
| * | patch: differentiate not found and invalid patchesEdward Thomson2016-05-262-7/+77
| | |
| * | git_patch_parse_ctx: refcount the contextEdward Thomson2016-05-266-102/+172
| | |
| * | git_diff_generated: abstract generated diffsEdward Thomson2016-05-2615-1672/+1822
| | |
| * | parse: introduce parse_ctx_contains_sEdward Thomson2016-05-261-18/+25
| | |
| * | patch: `patch_diff` -> `patch_generated`Edward Thomson2016-05-266-112/+119
| | |
| * | vector: more sensible names for `grow_at`/`shrink_at`Edward Thomson2016-05-264-26/+26
| | |
| * | patch: `git_patch_from_patchfile` -> `git_patch_from_buffer`Edward Thomson2016-05-266-41/+44
| | |
| * | patch: provide static string `advance_expected`Edward Thomson2016-05-261-10/+13
| | |
| * | patch: formatting cleanupsEdward Thomson2016-05-262-2/+2
| | |
| * | git_vector_grow/shrink: correct shrink, and testsEdward Thomson2016-05-262-14/+117
| | |
| * | apply: test postimages that grow/shrink originalEdward Thomson2016-05-262-0/+131
| | | | | | | | | | | | | | | | | | | | | Test with some postimages that actually grow/shrink from the original, adding new lines or removing them. (Also do so without context to ensure that we can add/remove from a non-zero part of the line vector.)
| * | git_buf_quote/unquote: handle > \177Edward Thomson2016-05-262-2/+7
| | | | | | | | | | | | | | | | | | Parse values up to and including `\377` (`0xff`) when unquoting. Print octal values as an unsigned char when quoting, lest `printf` think we're talking about negatives.
| * | patch application: drop unnecessary `patch_image_init`Edward Thomson2016-05-261-10/+2
| | |
| * | patch parse: dup the patch from the callersEdward Thomson2016-05-263-11/+28
| | |
| * | patch parsing: squash some memory leaksEdward Thomson2016-05-262-0/+9
| | |
| * | patch: drop some warningsEdward Thomson2016-05-262-6/+5
| | |
| * | patch: use strlen to mean string lengthEdward Thomson2016-05-261-29/+27
| | | | | | | | | | | | | | | | | | | | | `oid_strlen` has meant one more than the length of the string. This is mighty confusing. Make it mean only the string length! Whomsoever needs to allocate a buffer to hold a string can null terminate it like normal.
| * | patch: show modes when only the mode has changedEdward Thomson2016-05-261-13/+21
| | |
| * | patch: quote filenames when necessaryEdward Thomson2016-05-261-33/+96
| | |