- 12 Jun, 2015 1 commit
-
-
Jeff Hostetler committed
-
- 08 Jun, 2015 3 commits
-
-
Downcase
Carlos Martín Nieto committed -
global: Ensure we free our SSL context.
Carlos Martín Nieto committed -
Tim Hentenaar committed
-
- 07 Jun, 2015 3 commits
-
-
path: error out if the callback returns an error
Carlos Martín Nieto committed -
Fixed build warnings on Xcode 6.1
Carlos Martín Nieto committed -
print_usage functions is defined but not used
Carlos Martín Nieto committed
-
- 06 Jun, 2015 1 commit
-
-
When the callback returns an error, we should stop immediately. This broke when trying to make sure we pass specific errors up the chain. This broke cancelling out of the loose backend's foreach.
Carlos Martín Nieto committed
-
- 04 Jun, 2015 1 commit
-
-
Change error when running out of ssh agent keys
Carlos Martín Nieto committed
-
- 03 Jun, 2015 1 commit
-
-
Use the previously created function to display a message when the arguments are not valid. ticket 3095
Ariel O. Barria committed
-
- 02 Jun, 2015 2 commits
-
-
Pierre-Olivier Latour committed
-
Marius Ungureanu committed
-
- 31 May, 2015 6 commits
-
-
This was forgotten when the feature was implemented.
Carlos Martín Nieto committed -
build maint branches on appveyor
Carlos Martín Nieto committed -
Implementation of url.*.insteadOf
Carlos Martín Nieto committed -
Patrick Steinhardt committed
-
Patrick Steinhardt committed
-
A remote's URLs are now modified according to the url.*.insteadOf and url.*.pushInsteadOf configurations. This allows a user to replace URL prefixes by setting the corresponding keys. E.g. "url.foo.insteadOf = bar" would replace the prefix "bar" with the new prefix "foo".
Patrick Steinhardt committed
-
- 29 May, 2015 7 commits
-
-
Edward Thomson committed
-
Some brain damaged tolower() implementations appear to want to take the locale into account, and this may require taking some insanely aggressive lock on the locale and slowing down what should be the most trivial of trivial calls for people who just want to downcase ASCII.
Edward Thomson committed -
Treat input bytes as unsigned before doing arithmetic on them, lest we look at some non-ASCII byte (like a UTF-8 character) as a negative value and perform the comparison incorrectly.
Edward Thomson committed -
Carlos Martín Nieto committed
-
Support getting SSH keys from memory, pt. 2
Carlos Martín Nieto committed -
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
Carlos Martín Nieto committed -
We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This *may* happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.
Edward Thomson committed
-
- 28 May, 2015 15 commits
-
-
Changed README to use new OCaml bindings to git
Edward Thomson committed -
Edgar Aroutiounian committed
-
Include conflicts when diffing
Carlos Martín Nieto committed -
Fill the pointers for matching refspecs
Edward Thomson committed -
Tackle remote API issues from bindings
Carlos Martín Nieto committed -
If there exists a conflict in the index, but no file in the working directory, this implies that the user wants to accept the resolution by removing the file. Thus, remove the conflict entry from the index, instead of trying to add a (nonexistent) file.
Edward Thomson committed -
Mark the `old_file` and `new_file` sides of a delta with a new bit, `GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of the delta exists in the diff. This is useful for indicating whether a working directory item exists or not, in the presence of a conflict. Diff users may have previously used DELETED to determine this information.
Edward Thomson committed -
When confronted with a conflict in the index, `git_index_add_all` should stage the working directory copy. If there is no file in the working directory, the conflict should simply be removed.
Edward Thomson committed -
cl_git_sandbox_init_new() will create a clar temp directory and initialize a new repository at that location.
Edward Thomson committed -
Edward Thomson committed
-
It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.
Edward Thomson committed -
Edward Thomson committed
-
Since a diff entry only concerns a single entry, zero the information for the index side of a conflict. (The index entry would otherwise erroneously include the lowest-stage index entry - generally the ancestor of a conflict.) Test that during status, the index side of the conflict is empty.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-