- 05 Feb, 2014 3 commits
-
-
In case we loose the race to update the reference, return GIT_EMODIFIED to let the user distinguish it from other types of errors.
Carlos Martín Nieto committed -
Change the name to _matching() intead of _if(), and force _set_target() to be a conditional update. If the user doesn't care about the old value, they should use git_reference_create().
Carlos Martín Nieto committed -
Allow updating references if the old value matches the given one.
Carlos Martín Nieto committed
-
- 04 Feb, 2014 6 commits
-
-
Corrections for merge working directory validation
Vicent Marti committed -
Edward Thomson committed
-
Validating the workdir should not compare HEAD to working directory - this is both inefficient (as it ignores the cache) and incorrect. If we had legitimately allowed changes in the index (identical to the merge result) then comparing HEAD to workdir would reject these changes as different. Further, this will identify files that were filtered strangely as modified, while testing with the cache would prevent this. Also, it's stupid slow.
Edward Thomson committed -
Edward Thomson committed
-
Edward Thomson committed
-
Edward Thomson committed
-
- 03 Feb, 2014 1 commit
-
-
Correct "new" id for reattached-HEAD reflog entry
Vicent Marti committed
-
- 02 Feb, 2014 3 commits
-
-
Add `git_reference_is_note`.
Vicent Marti committed -
Arthur Schreiber committed
-
Ben Straub committed
-
- 01 Feb, 2014 2 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
- 31 Jan, 2014 4 commits
-
-
Update to latest clar
Vicent Marti committed -
Russell Belfer committed
-
Reflog completionism
Vicent Marti committed -
Ben Straub committed
-
- 30 Jan, 2014 21 commits
-
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Ben Straub committed
-
Index tree-bob collision
Vicent Marti committed -
If you are checking out NONE, then don't remove.
Russell Belfer committed -
Russell Belfer committed
-
The checkout code used to defer removal of "blocking" files in checkouts until the blocked item was actually being written (since we have already checked that the removing the block is acceptable according to the update rules). Unfortunately, this resulted in an intermediate index state where both the blocking and new items were in the index which is no longer allowed. Now we just remove the blocking item in the first pass so it never needs to coexist. In cases where there are typechanges, this could result in a bit more churn of removing and recreating intermediate directories, but I'm going to assume that is an unusual case and the churn will not be too costly.
Russell Belfer committed -
Fix errors with zstream (and a variety of other cleanups)
Vicent Marti committed -
And don't terminate if there isn't space for it (since it's binary data, it's not worth a reallocation).
Russell Belfer committed -
Russell Belfer committed
-