- Jun 12, 2015
-
-
Jeff Hostetler authored
-
- Jun 08, 2015
-
-
Carlos Martín Nieto authored
Downcase
-
Carlos Martín Nieto authored
global: Ensure we free our SSL context.
-
Tim Hentenaar authored
-
- Jun 07, 2015
-
-
Carlos Martín Nieto authored
path: error out if the callback returns an error
-
Carlos Martín Nieto authored
Fixed build warnings on Xcode 6.1
-
Carlos Martín Nieto authored
print_usage functions is defined but not used
-
- Jun 06, 2015
-
-
Carlos Martín Nieto authored
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.
-
- Jun 04, 2015
-
-
Carlos Martín Nieto authored
Change error when running out of ssh agent keys
-
Ariel O. Barria authored
Use the previously created function to display a message when the arguments are not valid. ticket 3095
-
- Jun 03, 2015
-
-
Pierre-Olivier Latour authored
-
- Jun 02, 2015
-
-
Marius Ungureanu authored
-
- Jun 01, 2015
-
-
Carlos Martín Nieto authored
This was forgotten when the feature was implemented.
-
Carlos Martín Nieto authored
build maint branches on appveyor
-
- May 31, 2015
-
-
Carlos Martín Nieto authored
Implementation of url.*.insteadOf
-
Patrick Steinhardt authored
-
Patrick Steinhardt authored
-
Patrick Steinhardt authored
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".
-
- May 30, 2015
-
-
Edward Thomson authored
-
Edward Thomson authored
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 authored
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.
-
Carlos Martín Nieto authored
-
Carlos Martín Nieto authored
Support getting SSH keys from memory, pt. 2
-
- May 29, 2015
-
-
Carlos Martín Nieto authored
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
-
Edward Thomson authored
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 authored
Changed README to use new OCaml bindings to git
-
Edgar Aroutiounian authored
-
Carlos Martín Nieto authored
Include conflicts when diffing
-
- May 28, 2015
-
-
Edward Thomson authored
Fill the pointers for matching refspecs
-
Carlos Martín Nieto authored
Tackle remote API issues from bindings
-
Edward Thomson authored
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 authored
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 authored
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 authored
cl_git_sandbox_init_new() will create a clar temp directory and initialize a new repository at that location.
-
Edward Thomson authored
-
Edward Thomson authored
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 authored
-
Edward Thomson authored
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 authored
-
Edward Thomson authored
-