- 15 Feb, 2015 4 commits
-
-
Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
Stefan Widgren committed -
merge: lock index during the merge (not just checkout)
Carlos Martín Nieto committed -
allocations: test for overflow of requested size
Carlos Martín Nieto committed -
Fixups for rebase
Carlos Martín Nieto committed
-
- 14 Feb, 2015 5 commits
-
-
Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
Edward Thomson committed -
Edward Thomson committed
-
Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.
Edward Thomson committed -
Edward Thomson committed
-
Introduce `git_indexwriter`, to allow us to lock the index while performing additional operations, then complete the write (or abort, unlocking the index).
Edward Thomson committed
-
- 13 Feb, 2015 23 commits
-
-
Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.
Edward Thomson committed -
Switch to a standard branch-switching pattern of a `SAFE` checkout, then updating `HEAD`.
Edward Thomson committed -
Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.
Edward Thomson committed -
Users may want to try to pay attention to the `exec` field on all rebase operations.
Edward Thomson committed -
win32: limit the mode to `_wopen`/`_waccess`
Carlos Martín Nieto committed -
Edward Thomson committed
-
Edward Thomson committed
-
gcc and clang support __builtin_add_overflow, use it whenever possible, falling back to our naive routines.
Edward Thomson committed -
Edward Thomson committed
-
Make our overflow checking look more like gcc and clang's, so that we can substitute it out with the compiler instrinsics on platforms that support it. This means dropping the ability to pass `NULL` as an out parameter. As a result, the macros also get updated to reflect this as well.
Edward Thomson committed -
Win32 generally ignores Unix-like mode bits that don't make any sense on the platform (eg `0644` makes no sense to Windows). But WINE complains loudly when presented with POSIXy bits. Remove them. (Thanks @phkelley)
Edward Thomson committed -
Reinit `reader` pointer after reading included config file
Carlos Martín Nieto committed -
Fix build warning on Android
Carlos Martín Nieto committed -
https://github.com/attractivechaos/klib/pull/42/files introduces `kreallocarray`. Hook that up as our `git__reallocarray`.
Edward Thomson committed -
Edward Thomson committed
-
Add some helper functions to check for overflow in a type-specific manner.
Edward Thomson committed -
Ensure that the given length to `p_read` is of ssize_t and ensure that callers test the return as if it were an `ssize_t`.
Edward Thomson committed -
Use `size_t` to hold the size of arrays to ease overflow checking, lest we check for overflow of a `size_t` then promptly truncate by packing the length into a smaller type.
Edward Thomson committed -
Have the ALLOC_OVERFLOW testing macros also simply set_oom in the case where a computation would overflow, so that callers don't need to.
Edward Thomson committed -
Introduce `git_buf_grow_by` to incrementally increase the size of a `git_buf`, performing an overflow calculation on the growth.
Edward Thomson committed -
Introduce git__reallocarray that checks the product of the number of elements and element size for overflow before allocation. Also introduce git__mallocarray that behaves like calloc, but without the `c`. (It does not zero memory, for those truly worried about every cycle.)
Edward Thomson committed -
Edward Thomson committed
-
Introduce some helper macros to test integer overflow from arithmetic and set error message appropriately.
Edward Thomson committed
-
- 12 Feb, 2015 6 commits
-
-
Always do a time_t cast on st_mtime. st_mtime on Android is not the type of time_t but has the same meaning which is the number of seconds past epoch.
Leo Yang committed -
Check rebase options version on public entry points
Edward Thomson committed -
Fixes #2869. If included file includes more files, it may reallocate cfg_file->readers, hence invalidate not only `r` pointer, but `result` pointer as well.
Yury G. Kudryashov committed -
It fails at least on my computer, though it may depend on some unpredictable factors (say, will realloc() extend the memory segment in place, or it will allocate new memory).
Yury G. Kudryashov committed -
Jameson Miller committed
-
Checkout performance
Carlos Martín Nieto committed
-
- 11 Feb, 2015 2 commits
-
-
Remove stale reflog namespace directory before branch creation
Carlos Martín Nieto committed -
Ensure we can make a repo at the root of the filesystem
Carlos Martín Nieto committed
-