- 18 Oct, 2013 1 commit
-
-
license clarification + formatting all over
Vicent Martí committed
-
- 17 Oct, 2013 3 commits
-
-
fixed typo `can can` -> `can`
Haneef Mubarak committed -
added the second change suggested by @nulltoken (with two extra words :) )
Haneef Mubarak committed -
There are commercial open source applications, hence proprietary seems to be a better term. Also: - Trimmed header `=`'s to match text length - made libgit2 stand out everywhere - pretty printing links - irc link for those with the correct setup
Haneef Mubarak committed
-
- 16 Oct, 2013 12 commits
-
-
Checkout merge
Vicent Martí committed -
Edward Thomson committed
-
It seemed exceptionally silly to have a split there where no split needed to be.
Edward Thomson committed -
Move conflict handling into two steps: load the conflicts and then apply the conflicts. This is more compatible with the existing checkout implementation and makes progress reporting more sane.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)
Edward Thomson committed -
Edward Thomson committed
-
rename conflict tests for checkout conflicts, don't suffix filenames when checking out with USE_OURS or USE_THEIRS
Edward Thomson committed -
Prevent checkout tree when unresolved changes exist (unless FORCE flag is specified). Clear NAME table when checking out, to avoid checkout_conflicts from attempting to manipulate it. Ensure that NAME is also cleared at reset.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
- 11 Oct, 2013 2 commits
-
-
Provide the user with a more useful error code when a looking up a reference which name points to a namepace
Vicent Martí committed -
This lets the reference code return not-found when the user asks to look up a reference when in fact they pass a namespace.
Carlos Martín Nieto committed
-
- 10 Oct, 2013 2 commits
-
-
Fix a typo in the rpm build instructions.
Ben Straub committed -
Arthur Schreiber committed
-
- 09 Oct, 2013 2 commits
-
-
The iconv init was accidentally clearing the default error state during reference normalization. This resets so that normalization errors will be detected correctly.
Russell Belfer committed -
Add support for core.precomposeunicode on Mac
Vicent Martí committed
-
- 08 Oct, 2013 10 commits
-
-
Russell Belfer committed
-
Before these changes, looking up a reference would return the same precomposed or decomposed form of the reference name that was used to look it up, so on MacOS which ignores the difference between the two, a single reference could be looked up either way and git_reference_name would return the form of the name that was used to look it up! This change makes lookup always return the precomposed name if core.precomposeunicode is set regardless of which version was used to look it up. The reference iterator was already returning the precomposed form from earlier work. This also updates the CMakeLists.txt rules for enabling iconv usage because the clar tests for this code were actually not being activated properly with the old version. Finally, this moves git_repository_reset_filesystem from include/ git2/repository.h to include/git2/sys/repository.h since it is not really a function that normal library users should have to think about very often.
Russell Belfer committed -
WinHTTP: set Accept header for POSTs
Vicent Martí committed -
Ben Straub committed
-
A couple of tests were actually dealing incorrectly with case sensitivity issues on Linux because they were relying on having core.ignorecase set to true. Now that the fixture initialization sets the case sensitivity to be accurate for the platform, it exposed bugs in these tests.
Russell Belfer committed -
Ben Straub committed
-
Ben Straub committed
-
This cleans up some additional issues. The main change is that on a filesystem that doesn't support mode bits, libgit2 will now create new blobs with GIT_FILEMODE_BLOB always instead of being at the mercy to the filesystem driver to report executable or not. This means that if "core.filemode" lies and claims that filemode is not supported, then we will ignore the executable bit from the filesystem. Previously we would have allowed it. This adds an option to the new git_repository_reset_filesystem to recurse through submodules if desired. There may be other types of APIs that would like a "recurse submodules" option, but this one is particularly useful. This also has a number of cleanups, etc., for related things including trying to give better error messages when problems come up from the filesystem. For example, the FAT filesystem driver on MacOS appears to return errno EINVAL if you attempt to write a filename with invalid UTF-8 in it. We try to capture that with a better error message now.
Russell Belfer committed -
tree: allow retrieval of raw attributes
Vicent Martí committed -
When a tool needs to recreate the tree object (for example an interface to another VCS), it needs to use the raw attributes, forgoing any normalization.
Carlos Martín Nieto committed
-
- 05 Oct, 2013 5 commits
-
-
Multiple init
Vicent Martí committed -
Ben Straub committed
-
Philip Kelley committed
-
Ben Straub committed
-
Ben Straub committed
-
- 04 Oct, 2013 3 commits
-
-
When a repository is transferred from one file system to another, many of the config settings that represent the properties of the file system may be wrong. This adds a new public API that will refresh the config settings of the repository to account for the change of file system. This doesn't do a full "reinitialize" and operates on a existing git_repository object refreshing the config when done. This commit then makes use of the new API in clar as each test repository is set up. This commit also has a number of other clar test fixes where we were making assumptions about the type of filesystem, either based on outdated config data or based on the OS instead of the FS.
Russell Belfer committed -
Make git_index_read() cope with external additions and removals of the index file
Vicent Martí committed -
nulltoken committed
-