summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* p_open: make flags volatilecmn/clar-tmpCarlos Martín Nieto2014-05-021-1/+1
| | | | fml
* bypass the firstCarlos Martín Nieto2014-05-021-0/+7
|
* oopsCarlos Martín Nieto2014-05-021-1/+1
|
* swap orderCarlos Martín Nieto2014-05-021-1/+1
|
* umaskCarlos Martín Nieto2014-05-021-0/+2
|
* do lsCarlos Martín Nieto2014-05-021-6/+5
|
* quickfail to see how we start to errorCarlos Martín Nieto2014-05-021-1/+2
|
* travis: move clar's temporary dir under $HOMECarlos Martín Nieto2014-05-011-0/+4
| | | | | This is mostly a test now. Make clar use a different temporary directory, as the system one seems to become unwritable.
* Merge pull request #2304 from jacquesg/solarisVicent Marti2014-05-014-4/+9
|\ | | | | Solaris!
| * Check for NULL before passing it to vsnprintfJacques Germishuys2014-04-302-3/+3
| |
| * strcasecmp is in <strings.h>Jacques Germishuys2014-04-301-0/+1
| |
| * Build regex.c for Solaris. Added required defines for SolarisJacques Germishuys2014-04-301-1/+5
| |
* | Merge pull request #2314 from libgit2/cmn/known-libsVicent Marti2014-04-302-12/+12
|\ \ | | | | | | Assorted CMake fixups
| * | Don't exclude libssh2 from MinGWcmn/known-libsCarlos Martín Nieto2014-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | It reportedly works. It does not however work when cross-compiling on Travis, so let's disable it there. This fixes #2311.
| * | Workaround missing .pc files on FreeBSDTing-Wei Lan2014-04-301-2/+6
| | | | | | | | | | | | This fixes #2118
| * | Unquiet CMake outputCarlos Martín Nieto2014-04-301-8/+4
| | | | | | | | | | | | | | | The point of this phase is to know what we have and not. Show the user a clear indication of what we have.
* | | Merge pull request #2315 from jacquesg/qsort-cygwinVicent Marti2014-04-301-1/+1
|\ \ \ | | | | | | | | cygwin also doesn't have qsort_r
| * | | cygwin also doesn't have qsort_rJacques Germishuys2014-04-301-1/+1
| | | |
* | | | ciscript: don't use an empty string as a numberCarlos Martín Nieto2014-04-301-1/+1
|/ / / | | | | | | | | | | | | | | | | | | An empty string is not a valid number, and some shells complain. Check instead if $COVERITY is non-empty, which is a common convention and what we're doing anyway.
* | | refs: document _next_name()Carlos Martín Nieto2014-04-301-0/+11
|/ / | | | | | | | | If it's not documented, it doesn't show up in the docs (and we really should document, anyway).
* | Merge pull request #2309 from jacquesg/midnightbsdVicent Marti2014-04-291-1/+1
|\ \ | | | | | | MidnightBSD may also not have strnlen
| * | MidnightBSD may also not have strnlenJacques Germishuys2014-04-291-1/+1
|/ /
* | Merge pull request #2306 from odcinek/development_cmakeVicent Marti2014-04-281-1/+1
|\ \ | |/ |/| Make the build CMake 2.6 compatible
| * Make the build CMake 2.6 compatibleMarcin Sawicki2014-04-281-1/+1
|/
* Merge pull request #2301 from libgit2/cmn/pack-objects-memoryVicent Marti2014-04-272-1/+2
|\ | | | | Keep the deflate buffer from ballooning up
| * pack-objects: always write out the status in write_one()cmn/pack-objects-memoryCarlos Martín Nieto2014-04-261-0/+1
| | | | | | | | Make sure we set the output parameter to a value.
| * zstream: grow based on used memory rather than allocatedCarlos Martín Nieto2014-04-261-1/+1
|/ | | | | | | | | | | | | | | When deflating data, we might need to grow the buffer. Currently we add a guess on top of the currently-allocated buffer size. When we re-use the buffer, it already has some memory allocated; adding to that means that we always grow the buffer regardless of how much we need to use. Instead, increase on top of the currently-used size. This still leaves us with the allocated size of the largest object we compress, but it's a minor pain compared to unbounded growth. This fixes #2285.
* refdb: fix typo and wordingCarlos Martín Nieto2014-04-261-1/+1
|
* Merge pull request #2299 from mekishizufu/fix_leaksVicent Marti2014-04-252-8/+6
|\ | | | | Plug some leaks
| * Reset tests: Use sandboxed indexJiri Pospisil2014-04-251-6/+3
| |
| * Filter: Make sure to release local on errorJiri Pospisil2014-04-251-2/+3
|/
* Merge pull request #2284 from jacquesg/push-progress-callbackVicent Marti2014-04-2520-121/+182
|\ | | | | Fire progress and update tips callbacks also for pushes.
| * Verify update_tips callbacks in push test casesJacques Germishuys2014-04-211-35/+83
| |
| * Fire update_tips callback also for pushes.Jacques Germishuys2014-04-211-17/+29
| |
| * Correct argument order of git__calloc()Jacques Germishuys2014-04-211-1/+1
| |
| * It is safe to free() a NULL pointerJacques Germishuys2014-04-211-3/+1
| |
| * Don't redefine the same callback types, their signatures may changeJacques Germishuys2014-04-2116-21/+21
| |
| * Rename progress callback to sideband_progressJacques Germishuys2014-04-213-5/+5
| |
| * Check the return codes of remote callbacks.Jacques Germishuys2014-04-212-7/+10
| | | | | | | | The user may have requested that the operation be cancelled.
| * Fire progress callbacks also for pushes.Jacques Germishuys2014-04-202-37/+37
| | | | | | | | | | It's not very useful to only know that a pre-receive hook has declined a push, you probably want to know why.
* | Merge pull request #2297 from libgit2/rb/status-with-precomposed-changesVicent Marti2014-04-252-39/+191
|\ \ | | | | | | Improve test coverage of status with different core.precomposeunicode settings
| * | Improve docs for status rename detection limitsrb/status-with-precomposed-changesRussell Belfer2014-04-242-4/+32
| | | | | | | | | | | | and make tests empty on platforms without iconv support.
| * | Test toggling core.precomposeunicode yields renameRussell Belfer2014-04-241-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is an interesting difference with core Git here, though. Because libgit2 will do rename detection with the working directory, in the last case where the HEAD and the working directory both have the decomposed data and the index has the composed data, we generate a single status record with two renames whereas Git will generate one rename (head to index) and one untracked file.
| * | Test decomposed unicode renames work as expectedRussell Belfer2014-04-241-37/+92
| | |
* | | Merge pull request #2241 from libgit2/rb/stash-skip-submodulesVicent Marti2014-04-257-107/+211
|\ \ \ | | | | | | | | Improve stash and checkout for ignored + untracked items
| * | | Handle explicitly ignored dir slightly differentlyrb/stash-skip-submodulesRussell Belfer2014-04-241-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When considering status of untracked directories, if we find an explicitly ignored item, even if it is a directory, treat the parent as an IGNORED item. It was accidentally being treated as an EMPTY item because we were not looking into the ignored subdir.
| * | | Treat ignored, empty, and untracked dirs differentRussell Belfer2014-04-234-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | In the iterator, distinguish between ignores and empty directories so that diff and status can ignore empty directories, but checkout and stash can treat them as untracked items.
| * | | Make checkout match diff for untracked/ignored dirRussell Belfer2014-04-226-99/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.
| * | | Failing test for stashing a buried ignored fileRussell Belfer2014-04-221-0/+13
| | | |
| * | | Make stash and checkout ignore contained reposRussell Belfer2014-04-224-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.
View Lorry Controller Status