- 14 Feb, 2015 3 commits
-
-
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 5 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 -
win32: limit the mode to `_wopen`/`_waccess`
Carlos Martín Nieto 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
-
- 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 9 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 -
Add libssh2's library and include directories.
Carlos Martín Nieto committed -
Large merge perf test.
Carlos Martín Nieto committed -
Update some third-party copyrights
Carlos Martín Nieto committed -
Fix doc comment formatting
Carlos Martín Nieto committed -
John Haley committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 10 Feb, 2015 2 commits
-
-
Ben Chatelain committed
-
Ben Chatelain committed
-
- 06 Feb, 2015 5 commits
-
-
Speed up AppVeyor builds.
nulltoken committed -
AppVeyor build machines come with Python 2.7 and CMake 2.8 pre-installed and in the PATH.
Arthur Schreiber committed -
Jeff Hostetler committed
-
repository: parse init.templatedir as a path
Edward Thomson committed -
This is a path so we must use the path getter so we get the tilde expansion done.
Carlos Martín Nieto committed
-
- 05 Feb, 2015 9 commits
-
-
Update clar to d17c7f6
Edward Thomson committed -
Edward Thomson committed
-
Don't try to strip trailing paths from the root directory on Windows (trying to create `C:` will fail).
Edward Thomson committed -
`p_stat` calls `git_win32_path_from_utf8`, which canonicalizes the path. Do not further try to modify the path, else we trim the trailing slash from a root directory and try to access `C:` instead of `C:/`.
Edward Thomson committed -
Edward Thomson committed
-
Test to ensure that we can create a repository at the filesystem root. Introduces a new test environment variable, `GITTEST_INVASIVE_FILESYSTEM` for tests that do terrible things like escaping the clar sandbox and writing to the root directory. It is expected that the CI builds will enable this but that normal people would not want this.
Edward Thomson committed -
Handle 8dot3 filenames being disabled on Win32
Edward Thomson committed -
for-each-ref example: initialize libgit2 in main
Edward Thomson committed -
I don't get how it was working without git_libgit2_init() call. I run it and libgit2 throws assertion somewhere in its internals. Now it works. Updated commit with shutdown at the end.
Boris Egorov committed
-
- 04 Feb, 2015 1 commit
-
-
Fixes for pedantry
Edward Thomson committed
-