- 28 May, 2015 12 commits
-
-
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
-
Make sure that we provide a blanked nitem side when the item does not exist in the working directory.
Edward Thomson committed -
When diffing against an index, return a new `GIT_DELTA_CONFLICTED` delta type for items that are conflicted. For a single file path, only one delta will be produced (despite the fact that there are multiple entries in the index). Index iterators now have the (optional) ability to return conflicts in the index. Prior to this change, they would be omitted, and callers (like diff) would omit conflicted index entries entirely.
Edward Thomson committed -
Edward Thomson committed
-
If `git_index_remove_bypath` does no work, and returns an OK error code, it should not set an error message.
Edward Thomson committed -
When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.
Edward Thomson committed -
Wrap the iterator current / advance functions so that we can extend them, but also handle GIT_ITEROVER cases in the iterator funcs instead of the callers.
Edward Thomson committed -
Edward Thomson committed
-
Fix ident replacement to match Git behavior
Carlos Martín Nieto committed
-
- 26 May, 2015 1 commit
-
-
Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the same.
Colomban Wendling committed
-
- 22 May, 2015 5 commits
-
-
Thin packs: don't
Carlos Martín Nieto committed -
When thickening a pack, avoid loading already loaded bases and trying to insert them all over again.
Edward Thomson committed -
When creating an index, know that we do not have an index for our own packfile, preventing some unnecessary file opens and error reporting.
Edward Thomson committed -
openssl: don't try to handle WANT_READ or WANT_WRITE
Edward Thomson committed -
Carlos Martín Nieto committed
-
- 21 May, 2015 7 commits
-
-
Carlos Martín Nieto committed
-
Cristian Oneț committed
-
Fix error when building as C++.
Carlos Martín Nieto committed -
index_add_all: include untracked files in new subdirs
Carlos Martín Nieto committed -
No need to get reports about individual ignored files, having a single ignored directory delta is enough.
Edward Thomson committed -
ignore: clear the error when matching a pattern negation
Edward Thomson committed -
Edward Thomson committed
-
- 20 May, 2015 6 commits
-
-
Jason Haslam committed
-
When we discover that we want to keep a negative rule, make sure to clear the error variable, as it we otherwise return whatever was left by the previous loop iteration.
Carlos Martín Nieto committed -
Our doc parser really wants the types to be declared in the header it's reading.
Carlos Martín Nieto committed -
Improve server error reporting
Carlos Martín Nieto committed -
This can be used by tools to show mesages about failing to communicate with the server. The error message in this case will often contain the server's error message, as far as it managed to send anything.
Carlos Martín Nieto committed -
When we fail to read from stdout, it's typically because the URL was wrong and the server process has sent some output over its stderr output. Read that output and set the error message to whatever we read from it.
Carlos Martín Nieto committed
-
- 19 May, 2015 2 commits
-
-
Use a diff for iteration in index_update_all and index_add_all
Edward Thomson committed -
Provide error messages for git_path_direach operations
Edward Thomson committed
-
- 17 May, 2015 1 commit
-
-
We set an error if we get an error when reading, but we don't bother setting an error message for write failing. This causes a cryptic error to be shown to the user when the target filesystem is full.
Carlos Martín Nieto committed
-
- 15 May, 2015 3 commits
-
-
Now that `git_path_direach` lets us specify an error message to report, set an appropriate error message while linking.
Carlos Martín Nieto committed -
This function deals with functions doing IO which means the amount of errors that can happen is quit large. It does not help if it always ovewrites the underlying error message with a less understandable version of "something went wrong". Instead, only use this generic message if there was no error set by the callback.
Carlos Martín Nieto committed -
Updated dlibgit link.
Carlos Martín Nieto committed
-
- 14 May, 2015 3 commits
-
-
Bring Early EOF message in line with the other two
Carlos Martín Nieto committed -
Morton Fox committed
-
Marius Ungureanu committed
-