summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #805 from nulltoken/fix/revwalk-email-parsingVicent Martí2012-07-121-0/+3
|\ \ \ | | | | | | | | Fix revwalk email parsing
| * | | signature: prevent angle bracket usage in identitynulltoken2012-07-111-0/+3
| | | |
* | | | Merge pull request #814 from nulltoken/topic/revparse-refacVicent Martí2012-07-122-0/+40
|\ \ \ \ | | | | | | | | | | Revparse refactoring: a start
| * | | | refs: introduce git_reference_remote_tracking_from_branch()nulltoken2012-07-121-0/+21
| | | | |
| * | | | commit: introduce git_commit_nth_gen_ancestor()nulltoken2012-07-121-0/+19
| |/ / /
* | | | Merge pull request #812 from arrbee/assorted-tweaksVicent Martí2012-07-122-2/+23
|\ \ \ \ | |/ / / |/| | | Assorted goodies
| * | | Add flag to write gitlink on setting repo workdirRussell Belfer2012-07-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This added a flag to the `git_repository_set_workdir()` function that enables generation of a `.git` gitlink file that links the new workdir to the parent repository. Essentially, the flag tells the function to write out the changes to disk to permanently set the workdir of the repository to the new path. If you pass this flag as true, then setting the workdir to something other than the default workdir (i.e. the parent of the .git repo directory), will create a plain file named ".git" with the standard gitlink contents "gitdir: <repo-path>", and also update the "core.worktree" and "core.bare" config values. Setting the workdir to the default repo workdir will clear the core.worktree flag (but still permanently set core.bare to false). BTW, the libgit2 API does not currently provide a function for clearing the workdir and converting a non-bare repo into a bare one.
| * | | Adding git_config_foreach_match() iteration fnRussell Belfer2012-07-101-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new config iteration function that let's you iterate over just the config entries that match a particular regular expression. The old foreach becomes a simple use of this with an empty pattern. This also fixes an apparent bug in the existing `git_config_foreach` where returning a non-zero value from the iteration callback was not correctly aborting the iteration and the returned value was not being propogated back to the caller of foreach. Added to tests to cover all these changes.
* | | | Merge pull request #801 from nulltoken/fix/ref-renamingVicent Martí2012-07-112-0/+12
|\ \ \ \ | |/ / / |/| | | refs and revparse love <3
| * | | refs: deploy git_reference_has_log()nulltoken2012-07-071-0/+2
| | | |
| * | | refs: add git_reference_has_log()nulltoken2012-07-071-0/+10
| | | |
* | | | Merge pull request #793 from libgit2/tree-entry-by-pathRussell Belfer2012-07-101-14/+53
|\ \ \ \ | | | | | | | | | | Bring back `entry_bypath`
| * | | | tree: Rename `entry_copy` to `entry_dup`Vicent Marti2012-06-291-2/+2
| | | | |
| * | | | tree: Bring back `entry_bypath`Vicent Marti2012-06-291-14/+53
| | |/ / | |/| | | | | | | | | | Smaller, simpler, faster.
* | | | Merge pull request #797 from yorah/fix/inter-hunk-contextRussell Belfer2012-07-101-1/+1
|\ \ \ \ | |_|/ / |/| | | diff: make inter-hunk-context default value git-compliant
| * | | diff: make inter-hunk-context default value git-compliantyorah2012-07-021-1/+1
| |/ / | | | | | | | | | Default in git core is 0, not 3
* | | Replace incorrect 'it' with 'if' in documentationKevin Sawicki2012-07-031-2/+2
|/ /
* | indexer: don't use '/objects/pack/' unconditionallyCarlos Martín Nieto2012-06-281-2/+2
| | | | | | | | | | Not everyone who indexes a packfile wants to put it in the standard git repository location.
* | Merge pull request #785 from nulltoken/topic/refs-fromglobVicent Martí2012-06-251-1/+30
|\ \ | | | | | | Topic/refs fromglob
| * | references: introduce git_reference_foreach_glob()nulltoken2012-06-221-1/+30
| | |
* | | amigaos: CleanupVicent Marti2012-06-221-39/+1
| | |
* | | Merge branch 'pull-req' of https://github.com/chris-y/libgit2 into amigaosVicent Marti2012-06-223-1/+10
|\ \ \ | |/ / |/| |
| * | Updates from comments on OS4 compatibility pull request ↵Chris Young2012-06-141-2/+0
| | | | | | | | | | | | http://github.com/libgit2/libgit2/pull/766
| * | Merge remote-tracking branch 'source/development' into developmentChris Young2012-06-136-24/+165
| |\ \
| * | | Fix gethostbyname compatibilityChris Young2012-06-091-5/+1
| | | |
| * | | Generic needs compat filesChris Young2012-06-081-1/+1
| | | |
| * | | OS4 compatibilityChris Young2012-06-081-0/+2
| | | |
| * | | Fix double-defines when using GIT_OLD_ERRORSChris Young2012-06-071-1/+3
| | | |
| * | | Network byte order is big-endian - the way it should be :)Chris Young2012-06-071-0/+8
| | | |
| * | | Merge remote-tracking branch 'source/development' into update-testChris Young2012-06-0736-1156/+3758
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging main libgit2! Conflicts: CMakeLists.txt src/unix/map.c
| * | | | Required include for OS4 to typedef int64_tChris Young2012-06-051-0/+3
| | | | |
* | | | | branch: drop git_branch_list()nulltoken2012-06-211-24/+0
| | | | |
* | | | | branch: add git_branch_foreach()nulltoken2012-06-211-0/+25
| |_|_|/ |/| | |
* | | | Merge pull request #775 from arrbee/fix-index-filemodesVicent Martí2012-06-191-0/+29
|\ \ \ \ | | | | | | | | | | Make index add/append support core.filemode flag
| * | | | Nicer constantRussell Belfer2012-06-191-1/+1
| | | | |
| * | | | Make index add/append support core.filemode flagRussell Belfer2012-06-191-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes git_index_add and git_index_append to behave more like core git, preserving old filemode data in the index when adding and/or appending with core.filemode = false. This also has placeholder support for core.symlinks and core.ignorecase, but those flags are not implemented (well, symlinks has partial support for preserving mode information in the same way that git does, but it isn't tested).
* | | | | message: Expose git_message_prettify()nulltoken2012-06-193-4/+45
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_commit() and git_tag() no longer prettify the message by default. This has to be taken care of by the caller. This has the nice side effect of putting the caller in position to actually choose to strip the comments or not.
* | | | Merge pull request #753 from nulltoken/topic/merge-base-manyVicent Martí2012-06-181-0/+10
|\ \ \ \ | |_|_|/ |/| | | Expose git_merge_base_many()
| * | | merge: Expose git_merge_base_many()nulltoken2012-06-071-0/+10
| | | |
* | | | Expose git_refspec_parse()Carlos Martín Nieto2012-06-121-0/+8
| | | | | | | | | | | | | | | | | | | | This function has been available for some time, but never in a header. Expose it so we can use it from outside the library.
* | | | Minor fixes, cleanups, and clarificationsRussell Belfer2012-06-081-22/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are three actual changes in this commit: 1. When the trailing newline of a file is removed in a diff, the change will now be reported with `GIT_DIFF_LINE_DEL_EOFNL` passed to the callback. Previously, the `ADD_EOFNL` constant was given which was just an error in my understanding of when the various circumstances arose. `GIT_DIFF_LINE_ADD_EOFNL` is deprecated and should never be generated. A new newline is simply an `ADD`. 2. Rewrote the `diff_delta__merge_like_cgit` function that contains the core logic of the `git_diff_merge` implementation. The new version doesn't actually have significantly different behavior, but the logic should be much more obvious, I think. 3. Fixed a bug in `git_diff_merge` where it freed a string pool while some of the string data was still in use. This led to `git_diff_print_patch` accessing memory that had been freed. The rest of this commit contains improved documentation in `diff.h` to make the behavior and the equivalencies with core git clearer, and a bunch of new tests to cover the various cases, oh and a minor simplification of `examples/diff.c`.
* | | | Fix filemode comparison in diffsRussell Belfer2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File modes were both not being ignored properly on platforms where they should be ignored, nor be diffed consistently on platforms where they are supported. This change adds a number of diff and status filemode change tests. This also makes sure that filemode-only changes are included in the diff output when they occur and that filemode changes are ignored successfully when core.filemode is false. There is no code that automatically toggles core.filemode based on the capabilities of the current platform, so the user still needs to be careful in their .git/config file.
* | | | misc: Fix warnings from PVS Studio trialVicent Martí2012-06-071-1/+1
| | | |
* | | | Merge pull request #669 from nulltoken/topic/resetVicent Martí2012-06-072-0/+50
|\ \ \ \ | | | | | | | | | | Add git_reset()
| * | | | Add git_reset()nulltoken2012-06-072-0/+50
| | | | | | | | | | | | | | | | | | | | Currently supports Soft and Mixed modes.
* | | | | Merge pull request #684 from benstraub/rev-parseVicent Martí2012-06-071-0/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rev parse
| * | | | Merge branch 'development' into rev-parseBen Straub2012-06-0528-278/+333
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/util.h tests-clar/refs/branches/listall.c
| * | | | | Adding comment documentation for rev-parse api.Ben Straub2012-05-111-3/+17
| | | | | |
| * | | | | First stab at implementation of rev-parse.Ben Straub2012-05-111-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version supports refspecs of these kinds: - Full & partial SHAs - Output from "git describe" - "/refs/heads/master" (full ref names) - "master" (partial ref names) - "FETCH_HEAD" (named heads)
* | | | | | Merge pull request #704 from nulltoken/topic/blob_fromchunksVicent Martí2012-06-071-0/+42
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Add the ability to create blob given a provider of chunks of bytes
View Lorry Controller Status