summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Updates from comments on OS4 compatibility pull request ↵Chris Young2012-06-145-31/+35
| | | | http://github.com/libgit2/libgit2/pull/766
* Merge remote-tracking branch 'source/development' into developmentChris Young2012-06-1328-154/+2055
|\
| * Precompile headers for MSVC.Ben Straub2012-06-132-0/+20
| |
| * Fix issue #763Frederick Ros2012-06-131-3/+5
| |
| * Merge pull request #760 from nulltoken/topic/logAllRefUpdatesRussell Belfer2012-06-121-0/+3
| |\ | | | | | | make git_repository_init() value the core.logallrefupdates config entry
| | * repository: make git_repository_init() value the core.logallrefupdates ↵nulltoken2012-06-121-0/+3
| | | | | | | | | | | | config entry
| * | revparse: remove unnecessary GIT_BEGIN_DECLMichael Schubert2012-06-121-5/+0
| |/
| * Fix fragile commit parsing in revwalkRussell Belfer2012-06-111-15/+21
| |
| * Fix mingw32 (Travis) build.Ben Straub2012-06-111-0/+1
| |
| * Ignores allow unescapes internal whitespaceRussell Belfer2012-06-111-0/+2
| |
| * Better fix for isalpha in drive letter detectionRussell Belfer2012-06-081-4/+7
| | | | | | | | Missed a place that used this and missed git__isalpha
| * isalpha is not great for UTF-8Russell Belfer2012-06-081-1/+2
| | | | | | | | | | | | | | When checking for a drive letter on windows, instead of using isalpha(), it is better to just check for a..z and A..Z, I think, particularly because the MS isalpha implementation appears to assert when given an 0xFF byte.
| * Minor fixes, cleanups, and clarificationsRussell Belfer2012-06-082-27/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0712-14/+20
| |
| * Fixing rev-parse-induced Travis errors.Ben Straub2012-06-071-0/+5
| |
| * Merge pull request #669 from nulltoken/topic/resetVicent Martí2012-06-074-61/+164
| |\ | | | | | | Add git_reset()
| | * Add git_reset()nulltoken2012-06-074-61/+164
| | | | | | | | | | | | Currently supports Soft and Mixed modes.
| * | Merge pull request #684 from benstraub/rev-parseVicent Martí2012-06-076-14/+1727
| |\ \ | | | | | | | | Rev parse
| | * | Prefer git__free (again).Ben Straub2012-06-071-1/+1
| | | |
| | * | Rename internal function.Ben Straub2012-06-071-2/+2
| | | |
| | * | Rename posix wrappers with 'p_' prefix.Ben Straub2012-06-065-15/+19
| | | |
| | * | Remove 'git__' prefix from a static function.Ben Straub2012-06-061-2/+2
| | | |
| | * | Rev-parse: stop referencing freed memory.Ben Straub2012-06-061-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Converted an internal utility to return an oid, rather than a tree entry (whose lifetime is tied to the parent tree, which was freed before returning).
| | * | Prefer git__free() to free().Ben Straub2012-06-061-1/+1
| | | |
| | * | Move git__date_parse declaration to util.h.Ben Straub2012-06-064-16/+11
| | | |
| | * | Fix signatures for tree calls.Ben Straub2012-06-061-4/+4
| | | |
| | * | Merge branch 'development' into rev-parseBen Straub2012-06-0560-989/+1322
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/util.h tests-clar/refs/branches/listall.c
| | * | | Rev-parse: implement ":/foo" syntax.Ben Straub2012-06-011-5/+47
| | | | |
| | * | | Rev-parse: Plug memory leaks.Ben Straub2012-05-311-0/+4
| | | | |
| | * | | Rev-parse: add "tag:README" syntax.Ben Straub2012-05-301-0/+60
| | | | |
| | * | | Approxidate: use libgit2 naming/calling conventions.Ben Straub2012-05-303-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Also use git_time_t (64-bit integer) for time values, although the 2038 problem is still present on 32-bit machines.
| | * | | Fix date.c build in msvc.Ben Straub2012-05-156-22/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported the win32 implementations of gmtime_r, localtime_r, and gettimeofday to be part of the posix compatibility layer, and fixed git_signature_now to use them.
| | * | | Rev-parse: better error handling for chaining.Ben Straub2012-05-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed an error where "nonexistant^N" or similar would fall into an assert. This now properly returns an error.
| | * | | Rev-parse: proper error checking.Ben Straub2012-05-111-22/+24
| | | | |
| | * | | Rev-parse: regex check for "git describe" output.Ben Straub2012-05-111-0/+17
| | | | |
| | * | | Plugging memory leak.Ben Straub2012-05-111-0/+2
| | | | |
| | * | | Rev-parse: now capturing and reporting regex errors.Ben Straub2012-05-111-5/+14
| | | | |
| | * | | Rev-parse: now @{-N} syntax searches in the right direction!Ben Straub2012-05-111-13/+19
| | | | |
| | * | | Now properly handling branches with "-g" in their names.Ben Straub2012-05-111-3/+3
| | | | |
| | * | | Simplifying revparse_lookup_fully_qualified_ref.Ben Straub2012-05-111-16/+4
| | | | |
| | * | | Rev-parse: @{time} syntax.Ben Straub2012-05-114-34/+987
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported date.c (for approxidate_careful) from git.git revision aa39b85. Trimmed out the parts we're not using.
| | * | | Rev-parse: "ref^{/regex}" syntax.Ben Straub2012-05-111-6/+47
| | | | |
| | * | | Rev-parse: fixing double-freeing. Thanks, Visual Studio!Ben Straub2012-05-111-1/+1
| | | | |
| | * | | Rev-parse: "ref@{upstream}" syntax.Ben Straub2012-05-111-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Added tracking configuration to the test repo's config to support unit tests.
| | * | | Fixed last 2 memory leaks in rev-parse.Ben Straub2012-05-111-13/+13
| | | | |
| | * | | Rev-parse: plugging (most) memory leaks.Ben Straub2012-05-111-21/+24
| | | | |
| | * | | Incorporating feedback from @tanoku.Ben Straub2012-05-111-8/+9
| | | | | | | | | | | | | | | | | | | | Removed repeated strlen's, and unnecessary loop-termination variable.
| | * | | Implementing rev-parse's ref@{n} and @{-n} syntaxes.Ben Straub2012-05-111-16/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Added some reflags to the test repo to support unit tests.
| | * | | Implementing rev-parse's "ref~2" syntax.Ben Straub2012-05-111-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Also extended the test suite to include chaining operators, e.g. "master^2~3^4".
View Lorry Controller Status