summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Plug some leaksCarlos Martín Nieto2015-09-271-0/+3
|
* Fix binary diffsGuille -bisho-2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git expects an empty line after the binary data: literal X ...binary data... <empty_line> The last literal block of the generated patches were not containing the required empty line. Example: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd|HZV+4u- git apply of that diff results in: error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2 fatal: patch with only garbage at line 10 The proper formating is: diff --git a/binary_file b/binary_file index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 6 Nc${NM%g@i}0ssZ|0lokL diff --git a/binary_file2 b/binary_file2 index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644 GIT binary patch literal 8 Pc${NM&PdElPvrst3ey5{ literal 13 Sc${NMEKbZyOexL+Qd|HZV+4u-
* Merge pull request #3437 from libgit2/cmn/plug-smCarlos Martín Nieto2015-09-241-13/+21
|\ | | | | submodule: plug a few leaks
| * submodule: plug a few leakscmn/plug-smCarlos Martín Nieto2015-09-241-13/+21
| |
* | win32: propogate filename too long errorsEdward Thomson2015-09-221-8/+15
|/
* Merge pull request #3434 from ethomson/reservednamesCarlos Martín Nieto2015-09-211-4/+20
|\ | | | | Win32 Reserved names: don't reserve names outside the working directory
| * repository: only reserve repo dirs in the workdirEdward Thomson2015-09-181-4/+20
| | | | | | | | | | | | | | | | | | | | Check that the repository directory is beneath the workdir before adding it to the list of reserved paths. If it is not, then there is no possibility of checking out files into it, and it should not be a reserved word. This is a particular problem with submodules where the repo directory may be in the super's .git directory.
* | config: buffer comments to match git's variable-addingcmn/config-commentCarlos Martín Nieto2015-09-181-4/+35
| | | | | | | | | | | | | | | | | | When there is a comment at the end of a section, git keeps it there, while we write the new variable right at the end. Keep comments buffered and dump them when we're going to output a variable or section, or reach EOF. This puts us in line with the config files which git produces.
* | `mkdir`: cope with root path on win32Edward Thomson2015-09-172-4/+5
| |
* | win32: return EACCES in `p_lstat`Edward Thomson2015-09-171-2/+9
| | | | | | | | | | | | Don't coalesce all errors into ENOENT. At least identify EACCES. All callers should be handling this case already, as the POSIX `lstat` will return this.
* | mkdir: chmod existing paths with `GIT_MKDIR_CHMOD`Edward Thomson2015-09-171-42/+49
| |
* | mkdir: find component paths for mkdir_relativeEdward Thomson2015-09-171-44/+134
| | | | | | | | | | | | | | | | | | | | | | | | `git_futils_mkdir` does not blindly call `git_futils_mkdir_relative`. `git_futils_mkdir_relative` is used when you have some base directory and want to create some path inside of it, potentially removing blocking symlinks and files in the process. This is not suitable for a general recursive mkdir within the filesystem. Instead, when `mkdir` is being recursive, locate the first existent parent directory and use that as the base for `mkdir_relative`.
* | core::mkdir tests: ensure we don't stomp symlinks in mkdirEdward Thomson2015-09-172-0/+17
| | | | | | | | | | In `mkdir` and `mkdir_r`, ensure that we don't try to remove symlinks that are in our way.
* | git_futils_mkdir_*: make a relative-to-base mkdirEdward Thomson2015-09-176-31/+32
|/ | | | | | | | | | | | Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter assumes that we own everything beneath the base, as if it were being called with a base of the repository or working directory, and is tailored towards checkout and ensuring that there is no bogosity beneath the base that must be cleaned up. This is (at best) slow and (at worst) unsafe in the larger context of a filesystem where we do not own things and cannot do things like unlink symlinks that are in our way.
* checkout: overwrite files with differing modesEdward Thomson2015-09-161-9/+6
| | | | | | | | | | | When a file exists on disk and we're checking out a file that differs in executableness, remove the old file. This allows us to recreate the new file with p_open, which will take the new mode into account and handle setting the umask properly. Remove any notion of chmod'ing existing files, since it is now handled by the aforementioned removal and was incorrect, as it did not take umask into account.
* Merge pull request #3425 from ethomson/diriter_rootCarlos Martín Nieto2015-09-131-2/+10
|\ | | | | Handle `git_path_diriter` instances at the drive root on Windows
| * diriter: don't double '/' on posixEdward Thomson2015-09-131-1/+5
| | | | | | | | | | | | The canonical directory path of the root directory of a volume on POSIX already ends in a slash (eg, `/`). This is true only at the root. Do not add a slash to paths in this case.
| * diriter: don't double '/' on WindowsEdward Thomson2015-09-131-1/+5
| | | | | | | | | | | | The canonical directory path of the root directory of a volume on windows already ends in a slash (eg, `c:/`). This is true only at the volume root. Do not add a slash to paths in this case.
* | iterator: loop fs_iterator advance (don't recurse)Edward Thomson2015-09-131-35/+50
| |
* | Merge pull request #3420 from ethomson/iteratorCarlos Martín Nieto2015-09-131-42/+56
|\ \ | |/ |/| iterator: advance the tree iterator smartly
| * iterator: advance the tree iterator smartlyEdward Thomson2015-09-111-42/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. While advancing the tree iterator, if we advance over things that we aren't interested in, then call `current`. Which may *itself* call advance. Error: stack overflow.
* | Don't free config in `git_transaction_commit`.Arthur Schreiber2015-09-131-1/+0
| | | | | | | | The config is not owned by the transaction, so please don’t free it.
* | Merge branch 'cmn/ignore-dir-check'Carlos Martín Nieto2015-09-131-7/+9
|\ \
| * | ignore: add test and adjust style and comment for dir with wildmatchCarlos Martín Nieto2015-09-131-7/+9
| | | | | | | | | | | | | | | | | | The previous commit left the comment referencing the earlier state of the code, change it to explain the current logic. While here, change the logic to avoid repeating the copy of the base pattern.
| * | Fix 'If we're dealing with a directory' checkVsevolod Parfenov2015-08-241-1/+1
| | |
* | | Merge pull request #3370 from libgit2/cmn/submodule-refactorCarlos Martín Nieto2015-09-131-144/+219
|\ \ \ | | | | | | | | submodule: refactor to be more explicit in the search
| * | | submodule: refactor to be more explicit in the searchCarlos Martín Nieto2015-09-101-144/+219
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When searching for information about a submdoule, let's be more explicit in what we expect to find. We currently insert a submodule into the map and change certain parameters when the config callback gets called. Switch to asking for the configuration we're interested in, rather than taking it in an arbitrary order.
* | | diff: check pathspec on non-filesEdward Thomson2015-09-121-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we're not doing pathspec matching, we let the iterator handle file matching for us. However, we can only trust the iterator to return *files* that match the pattern, because the iterator must return directories that are not strictly in the pathlist, but that are the parents of files that match the pattern, so that diff can later recurse into them. Thus, diff must examine non-files explicitly before including them in the delta list.
* | | mempack: expose clear functionEdward Thomson2015-09-112-4/+3
| | |
* | | Removing memory leak in mempack's freeBryan Woods2015-09-111-2/+6
| | | | | | | | | | | | It calls git_mempack_reset which reallocates the object array. git_oidmap_free is now called on it explicitly.
* | | Fixing dangling pointers in git_mempack_resetBryan Woods2015-09-101-0/+3
|/ / | | | | | | git_mempack_reset was leaving free'd pointers in the oidmap.
* | Merge pull request #3379 from theseion/additional_libssh2_error_reportingCarlos Martín Nieto2015-09-091-1/+3
|\ \ | | | | | | report libssh2 error if list of authentication methods can't be retrieved
| * | added a single line of additional error reporting from libssh2 when failing ↵Max Leske2015-08-141-1/+3
| | | | | | | | | | | | to retrieve the list of authentication methods
* | | Merge pull request #3353 from ethomson/wrongcase_addCarlos Martín Nieto2015-09-081-22/+114
|\ \ \ | | | | | | | | index: canonicalize directory case when adding
| * | | git_index_add: allow case changing renamesEdward Thomson2015-09-081-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On case insensitive platforms, allow `git_index_add` to provide a new path for an existing index entry. Previously, we would maintain the case in an index entry without the ability to change it (except by removing an entry and re-adding it.) Higher-level functions (like `git_index_add_bypath` and `git_index_add_frombuffers`) continue to keep the old path for easier usage.
| * | | index: canonicalize directory case when addingEdward Thomson2015-09-081-7/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On case insensitive systems, when given a user-provided path in the higher-level index addition functions (eg `git_index_add_bypath` / `git_index_add_frombuffer`), examine the index to try to match the given path to an existing directory. Various mechanisms can cause the on-disk representation of a folder to not match the representation in HEAD or the index - for example, a case changing rename of some file `a/file.txt` to `A/file.txt` will update the paths in the index, but not rename the folder on disk. If a user subsequently adds `a/other.txt`, then this should be stored in the index as `A/other.txt`.
* | | | Merge pull request #3381 from leoyanggit/index_directory_iteratorEdward Thomson2015-09-081-0/+24
|\ \ \ \ | |/ / / |/| | | New feature: add the ablility to iterate through a directory in index
| * | | New API: git_index_find_prefixLeo Yang2015-09-041-0/+24
| | | | | | | | | | | | | | | | Find the first index entry matching a prefix.
* | | | Merge pull request #3413 from libgit2/cmn/follow-symlinkEdward Thomson2015-09-061-3/+81
|\ \ \ \ | | | | | | | | | | filebuf: follow symlinks when creating a lock file
| * | | | filebuf: follow symlinks when creating a lock filecmn/follow-symlinkCarlos Martín Nieto2015-09-051-3/+81
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | We create a lockfile to update files under GIT_DIR. Sometimes these files are actually located elsewhere and a symlink takes their place. In that case we should lock and update the file at its final location rather than overwrite the symlink.
* | | | Merge pull request #3366 from libgit2/cmn/index-hashmapEdward Thomson2015-09-063-17/+193
|\ \ \ \ | |/ / / |/| | | Use a hashmap for path-based lookups in the index
| * | | index: put the icase insert choice in macroscmn/index-hashmapCarlos Martín Nieto2015-09-041-25/+30
| | | | | | | | | | | | | | | | | | | | This should let us see more clearly what we're doing and avoid the ugly 'if' we need every time we want to interact with the map.
| * | | index: keep a hash table as well as a vector of entriesCarlos Martín Nieto2015-08-142-17/+96
| | | | | | | | | | | | | | | | | | | | The hash table allows quick lookup of specific paths, while we use the vector for enumeration.
| * | | Add a hashmap for index entriesCarlos Martín Nieto2015-08-141-0/+92
| | | | | | | | | | | | | | | | They are hashed case-insensitively and take the stage into account.
* | | | Merge pull request #3402 from ethomson/faster_diffCarlos Martín Nieto2015-09-0111-174/+474
|\ \ \ \ | | | | | | | | | | Provide path matching in the iterators (for faster diffs)
| * | | | iterator: saner pathlist matching for idx iteratorEdward Thomson2015-08-312-62/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some nicer refactoring for index iteration walks. The index iterator doesn't binary search through the pathlist space, since it lacks directory entries, and would have to binary search each index entry and all its parents (eg, when presented with an index entry of `foo/bar/file.c`, you would have to look in the pathlist for `foo/bar/file.c`, `foo/bar` and `foo`). Since the index entries and the pathlist are both nicely sorted, we walk the index entries in lockstep with the pathlist like we do for other iteration/diff/merge walks.
| * | | | diff: drop `FILELIST_MATCH`Edward Thomson2015-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing.
| * | | | checkout: use pathlist-based iteratorsEdward Thomson2015-08-301-1/+7
| | | | |
| * | | | tree_iterator: use a pathlistEdward Thomson2015-08-301-1/+34
| | | | |
| * | | | diff: use new iterator pathlist handlingEdward Thomson2015-08-304-128/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using literal pathspecs in diff with `GIT_DIFF_DISABLE_PATHSPEC_MATCH` turn on the faster iterator pathlist handling. Updates iterator pathspecs to include directory prefixes (eg, `foo/`) for compatibility with `GIT_DIFF_DISABLE_PATHSPEC_MATCH`.
View Lorry Controller Status